From 03dfa1de5279c75a4206f59226d871823bdbe72e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:59:41 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into local_20221024
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 402927e..d1f153a 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
@@ -241,8 +241,10 @@
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);
+ if (sysUserFrom.getUserType().equals(2)){
+ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
+ sysUserMapper.updateById(sysUserFrom);
+ }
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
.eq(GuideRepairOrder::getId, order.getGuideId()));
//短信发送
@@ -315,7 +317,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -324,7 +326,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -346,6 +348,19 @@
@Override
public int deleteConfigById(String Id) {
+ GuideRepairOrder guideRepairOrderDelete = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, Id));
+ //删除进展记录
+ guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
+ TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
+ transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()-1);
+ //对应办事指南减一
+ transactionEventMapper.updateById(transactionEvent);
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));
+ if (sysUser!=null){
+ //对应导半人员待导半数量建议
+ sysUser.setTransactionNum(sysUser.getTransactionNum()-1);
+ sysUserMapper.updateById(sysUser);
+ }
return baseMapper.deleteConfigById(Id);
}
--
Gitblit v1.7.1