From 922774d70590c7010c52c8e89094425b120631cf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 28 Nov 2023 19:49:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=9C=AA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsEvaluationNotMetController.java   | 12 +++++++-----
 .../impl/LawsEvaluationNotMetServiceImpl.java        |  5 -----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
index 06f3596c..fd1fc569 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
@@ -8,6 +8,7 @@ import com.jero.common.api.vo.ResultCommon;
 import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
 import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.system.vo.IdsMapBody;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.apache.commons.lang3.StringUtils;
@@ -99,16 +100,17 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
 	 @AutoLog(value = "未符合项-批量关闭")
 	 @ApiOperation(value="未符合项-批量关闭", notes="项目库-批量关闭")
 	 @PostMapping(value = "/batchClose")
-	 public Result<T> batchClose(@RequestBody Map<String, String> map) {
-		 if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
+	 public Result<T> batchClose(@RequestBody IdsMapBody body) {
+		 String ids = body.getIds();
+		 if(StringUtils.isEmpty(ids)){
 			 throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
 		 }
-		 List<String> ids = Arrays.asList(map.get("ids").split(","));
+		 List<String> idList = Arrays.asList(ids.split(","));
 		 //检查所选数据是否均是待整改状态、当前时间大于预计整改完成日期
-		 if (this.check(ids)) {
+		 if (this.check(idList)) {
 			 throw new JeroBootException(ResultCommon.CANNOT_CLOSE);
 		 }
-		 lawsEvaluationNotMetService.batchClose(ids);
+		 lawsEvaluationNotMetService.batchClose(idList);
 		 return Result.OK(ResultCommon.OK);
 	 }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
index 8970fcb1..1d23333a 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
@@ -65,9 +65,6 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 	 */
 	@Override
     public void add(LawsEvaluationNotMet lawsEvaluationNotMet) {
-        Date now = new Date();
-        lawsEvaluationNotMet.setCreateTime(now);
-        lawsEvaluationNotMet.setUpdateTime(now);
         save(lawsEvaluationNotMet);
     }
 
@@ -79,8 +76,6 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
 	 */
 	@Override
     public void editById(LawsEvaluationNotMet lawsEvaluationNotMet) {
-    	Date now = new Date();
-        lawsEvaluationNotMet.setUpdateTime(now);
     	saveOrUpdate(lawsEvaluationNotMet);
     }