From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 01 九月 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
index cc0effa..80f2e30 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
@@ -12,6 +12,7 @@
 import com.gkhy.safePlatform.commons.enums.ResultCodes;
 import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentTypeMngQueryCriteria;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -41,10 +42,10 @@
      */
     @PostMapping(value = "/page/list")
     public ResultVO selectAll(@RequestBody PageQuery<EquipmentTypeMngQueryCriteria> pageQuery){
-		PageUtils.checkCheck(pageQuery);
+        PageUtils.checkCheck(pageQuery);
 		return this.equipmentTypeMngService.queryAll(pageQuery);
     }
-
+	
 
     /**
      * 通过主键查询单条数据
@@ -79,11 +80,21 @@
      * @param ids 主键结合
      * @return 删除结果
      */
-    @GetMapping(value = "/delete")
-    public ResultVO delete(String ids) {
-	List<String> idList = Arrays.stream(ids.split(","))
-                .collect(Collectors.toList());
-        this.equipmentTypeMngService.removeByIds(idList);
+    @RequestMapping(value = "/delete",method = RequestMethod.POST)
+    public ResultVO delete(@RequestBody Long[] ids) {
+        if(ids == null){
+            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
+        }
+        List<Long> idList = Arrays.asList(ids);
+
+        List<EquipmentTypeMng> delList = new ArrayList<>();
+        idList.forEach(f->{
+            EquipmentTypeMng info = new EquipmentTypeMng();
+            info.setDelFlag(1);
+            info.setId(f);
+            delList.add(info);
+        });
+        this.equipmentTypeMngService.updateBatchById(delList);
         return new ResultVO<>(ResultCodes.OK);
     }
 
@@ -97,4 +108,4 @@
     public ResultVO treeData(){
         return new ResultVO<>(ResultCodes.OK,this.equipmentTypeMngService.treeData(0L));
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.2