From 07a7e4e1a172960806e41ce686044aabc50ca379 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 29 五月 2025 14:36:01 +0800
Subject: [PATCH] 点检报表修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..598a690 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
@@ -752,16 +752,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,6 +778,7 @@
// 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);
maps.add(hashMap);
@@ -790,6 +792,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 +817,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,6 +831,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);
}
@@ -838,6 +843,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 +866,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,6 +881,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);
}
@@ -885,6 +893,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