From 1bf6cb4c0bfc149737afa37a1df1c809b29c6139 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 13:57:43 +0800
Subject: [PATCH] 点检测试修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 3a7a1cc..8dc1de8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -140,9 +140,9 @@
String id = (String)record.get("id");
// String equipmentId = (String)record.get("equipmentId");
// String status = (String)record.get("status");
-// String inspectionStandardId = (String)record.get("inspectionStandardId");
-// List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
-// record.put("inspectionCycles",inspectionCycles);
+ String inspectionStandardId = (String)record.get("inspectionStandardId");
+ List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
+ record.put("inspectionCycles",inspectionCycles);
List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id);
record.put("inspectionOrderDetails",inspectionOrderDetails);
@@ -720,6 +720,14 @@
String workCenterId = equipment.getWorkCenterId();
Area area = areaService.getById(workCenterId);
+// DailyInspectionStandard standard = dailyInspectionStandardService.getOne(new LambdaQueryWrapper<DailyInspectionStandard>()
+// .eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
+// .eq(DailyInspectionStandard::getDelFlag, 0)
+// .eq(DailyInspectionStandard::getVersionStatus, "2"));
+ List<DailyInspectionStandard> list = dailyInspectionStandardService.lambdaQuery().eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
+ .eq(DailyInspectionStandard::getDelFlag, 0)
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
+
List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day",dataTime);
@@ -731,8 +739,14 @@
mapResult.put("equipentNum",equipment.getNum());
mapResult.put("equipentName",equipment.getName());
mapResult.put("equipmentModel",equipment.getModel());
+ mapResult.put("equipmentModel",equipment.getModel());
if(area != null){
mapResult.put("workCenterName",area.getName());
+ }
+ if(list.size() > 0){
+ mapResult.put("regulations",list.get(0).getDisUda1());
+ }else{
+ mapResult.put("regulations","-");
}
mapResult.put("list1",list1);
mapResult.put("list2",list2);
@@ -752,16 +766,17 @@
String detectionStandard = (String)map.get("detectionStandard");
List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(equipmentNum,name, detectionStandard,dataTime);
List<InspectionResultVo> listS = new ArrayList<>();
-
for (Map<String, Object> r : record) {
+
if(maps.size()>0){
Boolean flag = false;
for (Map<String, Object> map1 : maps) {
if(map1.containsValue(r.get("name")) && map1.containsValue(r.get("detectionStandard"))){
-// map1.put(r.get("dayTime").toString(),r.get("insResult"));
+ map1.put(r.get("dayTime").toString(),r.get("insResult"));
flag = true;
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)r.get("dayTime"));
+ inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth"));
inspectionResultVo.setInsResult((String)r.get("insResult"));
listS.add(inspectionResultVo);
@@ -777,8 +792,11 @@
// hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)r.get("dayTime"));
+ inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth"));
inspectionResultVo.setInsResult((String)r.get("insResult"));
listS.add(inspectionResultVo);
+
+ hashMap.put("dataList",listS);//----
maps.add(hashMap);
}
}else{
@@ -790,6 +808,7 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)r.get("dayTime"));
inspectionResultVo.setInsResult((String)r.get("insResult"));
+ inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth"));
listS.add(inspectionResultVo);
hashMap.put("dataList",listS);
@@ -814,6 +833,7 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listIn.add(inspectionResultVo);
map1.put("dataList",listIn);
@@ -827,7 +847,9 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listIn.add(inspectionResultVo);
+ hashMap.put("dataList",listIn);//---
hashMap.put("dataList",listIn);
}
}else{
@@ -838,6 +860,7 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listIn.add(inspectionResultVo);
hashMap.put("dataList",listIn);
@@ -860,6 +883,7 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listRe.add(inspectionResultVo);
map1.put("dataList",listRe);
@@ -874,8 +898,11 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listRe.add(inspectionResultVo);
hashMap.put("dataList",listRe);
+
+ maps3.add(hashMap);//---
}
}else{
HashMap<String, Object> hashMap = new HashMap<>();
@@ -885,6 +912,7 @@
InspectionResultVo inspectionResultVo = new InspectionResultVo();
inspectionResultVo.setDayTime((String)map.get("dayTime"));
inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listRe.add(inspectionResultVo);
hashMap.put("dataList",listRe);
--
Gitblit v1.9.3