From b854d8d7604329dcf99584d15f83ff02076d9e07 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 01 Sep 2022 10:52:04 +0800
Subject: [PATCH] 假删除fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
index 07e848a..1217145 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -16,6 +16,7 @@
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoDto;
import com.gkhy.safePlatform.equipment.repository.EquipmentInfoRepository;
+import com.gkhy.safePlatform.equipment.repository.EquipmentTypeMngRepository;
import com.gkhy.safePlatform.equipment.service.*;
import com.gkhy.safePlatform.equipment.utils.QueryHelpPlus;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -56,6 +57,9 @@
@DubboReference(check = false)
private AccountDepartmentService accountDepartmentService;
+
+ @Autowired
+ private EquipmentTypeMngRepository equipmentTypeMngRepository;
@Override
public ResultVO queryAll(PageQuery<EquipmentInfoQueryCriteria> pageQuery) {
@@ -200,6 +204,11 @@
takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
+
+ EquipmentTypeMng typeMng = equipmentTypeMngRepository.selectOne(new QueryWrapper<EquipmentTypeMng>().eq("id",infoDto.getEquipmentTypeId()));
+ if(typeMng != null){
+ infoDto.setEquipmentTypeName(typeMng.getTypeName());
+ }
return infoDto;
}
@@ -224,7 +233,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);
}
@@ -239,7 +256,14 @@
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
@@ -255,7 +279,14 @@
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);
}
//保存检查标准
@@ -268,7 +299,14 @@
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);
}
//保存保养标准
@@ -281,7 +319,14 @@
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);
}
@@ -293,7 +338,12 @@
.select("stop_status as stopStatus,count(0) as count")
.groupBy("stop_status");
- return this.listMaps(wrapper);
+ List<Map<String, Object>> list = this.listMaps(wrapper);
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("-1",equipmentInfoRepository.countOverTime());//超时未保养
+ return list;
}
@Override
--
Gitblit v1.9.2