From 7542603a0f22dd73287556c9ec0df39184091ab0 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 10:30:32 +0800
Subject: [PATCH] 点检报表增加管理制度
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 598a690..ebb7e5a 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
@@ -720,6 +720,12 @@
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::getVersion, "2"));
+
+
List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day",dataTime);
@@ -731,9 +737,12 @@
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());
}
+ mapResult.put("regulations",standard.getDisUda1());
+
mapResult.put("list1",list1);
mapResult.put("list2",list2);
mapResult.put("list3",list3);
@@ -781,6 +790,8 @@
inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth"));
inspectionResultVo.setInsResult((String)r.get("insResult"));
listS.add(inspectionResultVo);
+
+ hashMap.put("dataList",listS);//----
maps.add(hashMap);
}
}else{
@@ -833,6 +844,7 @@
inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listIn.add(inspectionResultVo);
+ hashMap.put("dataList",listIn);//---
hashMap.put("dataList",listIn);
}
}else{
@@ -884,6 +896,8 @@
inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listRe.add(inspectionResultVo);
hashMap.put("dataList",listRe);
+
+ maps3.add(hashMap);//---
}
}else{
HashMap<String, Object> hashMap = new HashMap<>();
--
Gitblit v1.9.3