From b7d5b529707e5bd98ec334c1be4b13c21e69f6e6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 22 Aug 2023 17:56:14 +0800
Subject: [PATCH] 水库填报修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
index 645dcbf..2b444ef 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResProjectUtilizeServiceImpl.java
@@ -92,6 +92,7 @@
 	private int addOrUpdateByGuid(TbAttResProjectUtilize oldAbAttResBase,TbAttResProjectUtilize tbAttResProjectUtilize){
 		int i = 0;
 		if (null!=oldAbAttResBase){
+			tbAttResProjectUtilize.setGuid(oldAbAttResBase.getGuid());
 			// 更新
 			i = baseMapper.updateById(tbAttResProjectUtilize);
 		}else {
@@ -160,6 +161,11 @@
 		if (newTbAttResProjectUtilize.getCheckState()==3){
 			fillName = "退回" + (null==newTbAttResProjectUtilize.getCheckLog()?"":":" + newTbAttResProjectUtilize.getCheckLog());
 		}
+		// 管理员编辑
+		if (newTbAttResProjectUtilize.getCheckState()==4){
+			fillName = "编辑";
+			newTbAttResProjectUtilize.setCheckState(oldAbAttResBase.getCheckState());
+		}
 
 		// 拼接
 		String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());

--
Gitblit v1.9.3