From 48c603fea407fbcbc2fa039e375bc11d25445c6e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 18:08:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 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 8a45c67..e34ab1a 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;
@@ -49,7 +50,7 @@
departmentIds.add(organizationChart.getId().toString());
}
List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
- if (sysUsers==null) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
+ if (sysUsers.size()==0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
for (OrganizationChartEntity organizationChart:organizationChartEntities) {
//获取下级部门
List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
@@ -58,15 +59,17 @@
departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
}
sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
- if (sysUsers==null){//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
+ if (sysUsers.size()==0){//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds,null,null);//获取导半人员
- if(sysUsers==null)//如果该所属地区没有导办人员则为特殊单据需要手动分配
+ if(sysUsers.size()==0)//如果该所属地区没有导办人员则为特殊单据需要手动分配
guideRepairOrder.setState("1");
}
}
- if (sysUsers!=null){//系统分配导办人员
+ if (sysUsers.size()>0){//系统分配导办人员
SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
guideRepairOrder.setState("2");
+ sysUser.setTransactionNum(sysUser.getTransactionNum()+1);
+ sysUserMapper.updateById(sysUser);
guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
//新增分配记录
@@ -78,7 +81,7 @@
entity.setToUserId(guideRepairOrder.getGuideUserId()+"");
entity.setFromUserId(guideRepairOrder.getSubmitUserId());
entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
- entity.setGuideId(guideRepairOrder.getId().toString());
+ entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
guideEvolveMapper.insertConfig(entity);
}
}
@@ -162,5 +165,39 @@
return baseMapper.countConfigList(matterName,ids);
}
+ @Override
+ public int updateSysUserOrderNum(GuideEvolveEntity order) {
+ if(order.getState().equals("13")){
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
+ sysUser.setTransactionNum(sysUser.getTransactionNum()+1);
+ return sysUserMapper.updateById(sysUser);
+ }else if(order.getState().equals("12")){
+ SysUser sysUserTo= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
+ SysUser sysUserFrom= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
+ sysUserTo.setTransactionNum(sysUserTo.getTransactionNum()+1);
+ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum()-1);
+ sysUserMapper.updateById(sysUserFrom);
+ return sysUserMapper.updateById(sysUserTo);
+ }
+ return 0;
+ }
+
+ /**
+ * 1 今天 2昨天 3本月 4本年度 String time
+ * @param state
+ * @param ids
+ * @return
+ */
+ @Override
+ 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
+ public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
+ return baseMapper.countListNum(state, ids,time);
+ }
+
}
--
Gitblit v1.7.1