From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
index 768aebe..58d6fb3 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
@@ -15,6 +15,7 @@
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -84,18 +85,6 @@
 //    }
 
 
-    /**
-     * 分页查询所有数据
-     *
-     * @param pageQuery 查询实体
-     * @return 所有数据
-     */
-    @PostMapping(value = "/page/list")
-    public ResultVO selectAll(@RequestBody PageQuery<TargetExamineQueryCriteria> pageQuery){
-        PageUtils.checkCheck(pageQuery);
-        return this.targetExamineService.queryAll(pageQuery);
-    }
-
 
     /**
      * 通过主键查询单条数据
@@ -138,7 +127,15 @@
             return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
         }
         List<Long> idList = Arrays.asList(ids);
-        this.targetExamineService.removeByIds(idList);
+
+        List<TargetExamine> delList = new ArrayList<>();
+        idList.forEach(f->{
+            TargetExamine info = new TargetExamine();
+            info.setDelFlag(1);
+            info.setId(f);
+            delList.add(info);
+        });
+        this.targetExamineService.updateBatchById(delList);
         return new ResultVO<>(ResultCodes.OK);
     }
 

--
Gitblit v1.9.2