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/service/impl/KeypointEquipmentInfoServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index 958d9fb..49a5e1c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -246,7 +246,15 @@
         if(StringUtils.hasText(infoDto.getDelTakecareDetails())){
             List<Long> idList = Arrays.stream(infoDto.getDelTakecareDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                     .collect(Collectors.toList());
-            equipmentTakecareDetailService.removeByIds(idList);
+
+            List<EquipmentTakecareDetail> delList = new ArrayList<>();
+            idList.forEach(f->{
+                EquipmentTakecareDetail info = new EquipmentTakecareDetail();
+                info.setDelFlag(1);
+                info.setId(f);
+                delList.add(info);
+            });
+            equipmentTakecareDetailService.updateBatchById(delList);
         }
 
         //保存设备检测
@@ -259,7 +267,15 @@
         if(StringUtils.hasText(infoDto.getDelTestDetails())){
             List<Long> idList = Arrays.stream(infoDto.getDelTestDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                     .collect(Collectors.toList());
-            equipmentTestDetailService.removeByIds(idList);
+            List<EquipmentTestDetail> delList = new ArrayList<>();
+            idList.forEach(f->{
+                EquipmentTestDetail info = new EquipmentTestDetail();
+                info.setDelFlag(1);
+                info.setId(f);
+                delList.add(info);
+            });
+            equipmentTestDetailService.updateBatchById(delList);
+
         }
         //设备检查 TODO
 
@@ -274,7 +290,15 @@
         if(StringUtils.hasText(infoDto.getDelRepaireDetails())){
             List<Long> idList = Arrays.stream(infoDto.getDelRepaireDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                     .collect(Collectors.toList());
-            equipmentRepairDetailService.removeByIds(idList);
+            List<EquipmentRepairDetail> delList = new ArrayList<>();
+            idList.forEach(f->{
+                EquipmentRepairDetail info = new EquipmentRepairDetail();
+                info.setDelFlag(1);
+                info.setId(f);
+                delList.add(info);
+            });
+            equipmentRepairDetailService.updateBatchById(delList);
+
         }
         //保存检查标准
         List<EquipmentCheckStandardDetail> checkStandardeDetailList = infoDto.getCheckStandardeDetailList();
@@ -286,7 +310,15 @@
         if(StringUtils.hasText(infoDto.getDelCheckStandardeDetails())){
             List<Long> idList = Arrays.stream(infoDto.getDelCheckStandardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                     .collect(Collectors.toList());
-            equipmentCheckStandardDetailService.removeByIds(idList);
+            List<EquipmentCheckStandardDetail> delList = new ArrayList<>();
+            idList.forEach(f->{
+                EquipmentCheckStandardDetail info = new EquipmentCheckStandardDetail();
+                info.setDelFlag(1);
+                info.setId(f);
+                delList.add(info);
+            });
+            equipmentCheckStandardDetailService.updateBatchById(delList);
+
         }
         //保存保养标准
         List<EquipmentTakecareStardardDetail> takecareStardardeDetailList = infoDto.getTakecareStardardeDetailList();
@@ -298,7 +330,15 @@
         if(StringUtils.hasText(infoDto.getDelTakecareStardardeDetails())){
             List<Long> idList = Arrays.stream(infoDto.getDelTakecareStardardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                     .collect(Collectors.toList());
-            equipmentTakecareStardardDetailService.removeByIds(idList);
+            List<EquipmentTakecareStardardDetail> delList = new ArrayList<>();
+            idList.forEach(f->{
+                EquipmentTakecareStardardDetail info = new EquipmentTakecareStardardDetail();
+                info.setDelFlag(1);
+                info.setId(f);
+                delList.add(info);
+            });
+            equipmentTakecareStardardDetailService.updateBatchById(delList);
+
         }
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.2