From f319da9fce782232b09d8587adb4c7e642f58204 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 15 十月 2022 16:39:28 +0800
Subject: [PATCH] 修改小程序获取不到用户信息 bug

---
 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 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..388de7c 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
@@ -6,6 +6,7 @@
 import com.dg.core.db.gen.entity.*;
 import com.dg.core.db.gen.mapper.*;
 import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.SmsUtil;
 import com.dg.core.util.Snowflake;
 import org.springframework.stereotype.Service;
 
@@ -15,7 +16,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;
@@ -32,6 +34,9 @@
     @Resource
     private  GuideEvolveMapper guideEvolveMapper;
 
+    @Resource
+    SmsUtil smsUtil;
+
     @Override
     public  int addOrder(GuideRepairOrder guideRepairOrder){
 
@@ -42,6 +47,21 @@
         guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
         guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
         List<String> departmentIds=new ArrayList<>();
+        Boolean isAdd=true;//是否能够新建工单
+        List<GuideRepairOrder> guideRepairOrders = baseMapper.selectList(new QueryWrapper<GuideRepairOrder>().lambda()
+                .eq(GuideRepairOrder::getMatterId, guideRepairOrder.getMatterId())
+                .eq(GuideRepairOrder::getConsultContent, guideRepairOrder.getConsultContent()));
+        if (guideRepairOrders.size()==0){
+            isAdd=true;
+        }else {
+            for (GuideRepairOrder guideRepair:guideRepairOrders) {
+                if (guideRepair.getState().equals("1")||guideRepair.getState().equals("2")||guideRepair.getState().equals("6")||guideRepair.getState().equals("7")){
+                    isAdd=false;
+                    break;
+                }
+            }
+        }
+         if (isAdd) {
         //自动分配业务代码开始
         List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(guideRepairOrder.getAreaCode());
         if (organizationChartEntities!=null){
@@ -81,6 +101,7 @@
                 entity.setFromUserId(guideRepairOrder.getSubmitUserId());
                 entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
                 entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
+//                smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
                 guideEvolveMapper.insertConfig(entity);
             }
         }
@@ -116,13 +137,17 @@
             guideRepairOrderImageMapper.insert(guideRepairOrderImage);
         }
         }
+
         int ans= baseMapper.insert(guideRepairOrder);
         int i = transactionEventMapper.updateById(transactionEvent);
         if (ans>0&&i>0)
             return 1;
         else
             return 0;
-
+         }
+         else {
+             return  0;
+         }
     }
 
     public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -144,8 +169,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);
     }
 
@@ -162,6 +190,11 @@
     @Override
     public int countConfigList(String matterName,List<String> ids) {
         return baseMapper.countConfigList(matterName,ids);
+    }
+
+    @Override
+    public int countUser(String userId, String state) {
+        return baseMapper.countUser(userId,state);
     }
 
     @Override
@@ -188,8 +221,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
@@ -197,5 +231,10 @@
         return baseMapper.countListNum(state, ids,time);
     }
 
+    @Override
+    public SysUser getSubmitUser(GuideRepairOrder guideRepairOrder){
+        return sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,guideRepairOrder.getSubmitUserId()));
+    }
+
 
 }

--
Gitblit v1.7.1