From 57f3c889d4d7fbfc453ed1fe65194baa6120bc32 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 21 Aug 2023 18:02:21 +0800
Subject: [PATCH] 新增按区域发起外呼任务，填报流程修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
index 91f54c7..57767bf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
@@ -66,10 +66,10 @@
public boolean auditByGuid(TbAttResBase tbAttResBase) {
// 查询是否存在
TbAttResBase detail = baseMapper.getDetailByGuid(tbAttResBase.getGuid());
- // 更新审核日志
- setUpdateCheckLog(detail,tbAttResBase);
// 更新操作日志
setUpdateLog(detail,tbAttResBase);
+ // 更新审核日志
+ setUpdateCheckLog(detail,tbAttResBase);
if (null!=detail){
tbAttResBase.setGuid(detail.getGuid());
}
@@ -78,7 +78,7 @@
tbAttResBase.setCheckState(0);
}
// 更新数据
- int i = baseMapper.updateByGuid(tbAttResBase);
+ int i = baseMapper.updateById(tbAttResBase);
if (i>0){
return true;
}
@@ -94,8 +94,9 @@
int i = 0;
if (null!=tbAttResBase.getGuid()){
// 更新
- i = baseMapper.updateByGuid(tbAttResBase);
+ i = baseMapper.updateById(tbAttResBase);
}else {
+ tbAttResBase.setCreateTime(new Date());
i = baseMapper.insert(tbAttResBase);
}
// 返回
@@ -158,7 +159,12 @@
fillName = "审核";
}
if (newTbAttResBase.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResBase.getLog()?"":":" + newTbAttResBase.getLog());
+ fillName = "退回" + (null==newTbAttResBase.getCheckLog()?"":":" + newTbAttResBase.getCheckLog());
+ }
+ // 管理员编辑
+ if (newTbAttResBase.getCheckState()==4){
+ fillName = "编辑";
+ newTbAttResBase.setCheckState(oldAbAttResBase.getCheckState());
}
// 拼接
--
Gitblit v1.9.3