From 493aa6cef3d036702558bde1a6994dff705e12c1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 12 十月 2022 10:41:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 54d8629..5c3b91a 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -15,7 +15,8 @@
import java.util.List;
@Service
-public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder> implements IGuideRepairOrderService {
+public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder>
+ implements IGuideRepairOrderService {
@Resource
private TransactionEventMapper transactionEventMapper;
@@ -144,8 +145,11 @@
@Override
public int updateConfig(GuideRepairOrder order) {
- SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
- order.setGuideUserPhone(sysUser.getPhonenumber());
+ if ( order.getGuideUserId()!=null&&!order.getGuideUserId().equals(""))
+ {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
+ }
return baseMapper.updateConfig(order);
}
@@ -188,8 +192,9 @@
* @return
*/
@Override
- public int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState) {
- return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState);
+ public int countStatisticsNum(String state,List<String> ids,String time,
+ String isTimeout,String evaluateState,List<String> classifyIds) {
+ return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState,classifyIds);
}
@Override
--
Gitblit v1.7.1