From 1bdd6405e8caffc058066bdd26cb6de1ea9cf7ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 18:35:39 +0800
Subject: [PATCH] 8-9fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 6aab315..07e848a 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
@@ -80,8 +80,8 @@
EquipmentTestDetailQueryCriteria criteria1 = new EquipmentTestDetailQueryCriteria();
criteria1.setEquipmentId(f.getId());
criteria1.setInfoTpe(pageQuery.getSearchParams().getInfoType());
- List<EquipmentTestDetail> checkDetailList = equipmentTestDetailService.queryAll(criteria1);
- f.setCheckDetailList(checkDetailList);
+ List<EquipmentTestDetail> testDetailList = equipmentTestDetailService.queryAll(criteria1);
+ f.setTestDetailList(testDetailList);
//设备检查 TODO
@@ -101,7 +101,7 @@
collectDepIdSet.add(f.getLeadingDepartmentId());
collectDepIdSet.add(f.getLeadingPersonDepartmentId());
takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
- checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ testDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
//获取部门名集合
@@ -112,7 +112,7 @@
f.setLeadingDepartmentName(depNameMap.get(f.getLeadingDepartmentId()));
f.setLeadingPersonDepartmentName(depNameMap.get(f.getLeadingPersonDepartmentId()));
takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
- checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
});
@@ -152,8 +152,8 @@
EquipmentTestDetailQueryCriteria criteria1 = new EquipmentTestDetailQueryCriteria();
criteria1.setEquipmentId(infoDto.getId());
criteria1.setInfoTpe(infoDto.getInfoType());
- List<EquipmentTestDetail> checkDetailList = equipmentTestDetailService.queryAll(criteria1);
- infoDto.setCheckDetailList(checkDetailList);
+ List<EquipmentTestDetail> testDetailList = equipmentTestDetailService.queryAll(criteria1);
+ infoDto.setTestDetailList(testDetailList);
//设备检查 TODO
@@ -187,7 +187,7 @@
collectDepIdSet.add(infoDto.getLeadingDepartmentId());
collectDepIdSet.add(infoDto.getLeadingPersonDepartmentId());
takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
- checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ testDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
//获取部门名集合
@@ -198,7 +198,7 @@
infoDto.setLeadingDepartmentName(depNameMap.get(infoDto.getLeadingDepartmentId()));
infoDto.setLeadingPersonDepartmentName(depNameMap.get(infoDto.getLeadingPersonDepartmentId()));
takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
- checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
return infoDto;
}
--
Gitblit v1.9.2