From 2b4afe24e1136e4eb25e37b7a76565603ddc1a85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 15:37:44 +0800
Subject: [PATCH] 统计fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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..9a5f690 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;
@@ -57,6 +58,9 @@
@DubboReference(check = false)
private AccountDepartmentService accountDepartmentService;
+ @Autowired
+ private EquipmentTypeMngRepository equipmentTypeMngRepository;
+
@Override
public ResultVO queryAll(PageQuery<EquipmentInfoQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -80,8 +84,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 +105,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 +116,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 +156,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 +191,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,8 +202,13 @@
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()));});
+
+ EquipmentTypeMng typeMng = equipmentTypeMngRepository.selectOne(new QueryWrapper<EquipmentTypeMng>().eq("id",infoDto.getEquipmentTypeId()));
+ if(typeMng != null){
+ infoDto.setEquipmentTypeName(typeMng.getTypeName());
+ }
return infoDto;
}
@@ -293,7 +302,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