From 912e143c73f70ddcf43840bec60c35a3af12c312 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 11 十月 2022 16:49:47 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 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 4f908e2..54d8629 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
@@ -49,7 +49,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 +58,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());
//新增分配记录
@@ -162,6 +164,23 @@
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
@@ -169,8 +188,8 @@
* @return
*/
@Override
- public int countStatisticsNum(String state,List<String> ids,String time) {
- return baseMapper.countStatisticsNum(state,ids,time);
+ public int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState) {
+ return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState);
}
@Override
--
Gitblit v1.7.1