From 4d968c0ceb43dcbbc1c4226db163cb5618b3cf33 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 15:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..d02e7ae 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
@@ -67,6 +67,8 @@
if (sysUsers!=null){//系统分配导办人员
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