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 | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 e34ab1a..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;
@@ -33,6 +34,9 @@
@Resource
private GuideEvolveMapper guideEvolveMapper;
+ @Resource
+ SmsUtil smsUtil;
+
@Override
public int addOrder(GuideRepairOrder guideRepairOrder){
@@ -43,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){
@@ -82,6 +101,7 @@
entity.setFromUserId(guideRepairOrder.getSubmitUserId());
entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
+// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
guideEvolveMapper.insertConfig(entity);
}
}
@@ -117,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){
@@ -145,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);
}
@@ -163,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
@@ -199,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