From a72062286b8212d490804826b71c18f67e8f0fd2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 15:31:29 +0800
Subject: [PATCH] 数据结构修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 19 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 17a9be7..b343e06 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
@@ -34,6 +34,7 @@
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
//import org.jeecg.modules.system.service.IUploadService;
+import org.jeecg.modules.eam.vo.InspectionResultVo;
import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -737,7 +738,7 @@
String detectionStandard = (String)map.get("detectionStandard");
List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(equipmentNum,name, detectionStandard,dataTime);
- List<Map<String, Object>> list = new ArrayList<>();
+ List<InspectionResultVo> listS = new ArrayList<>();
for (Map<String, Object> r : record) {
if(maps.size()>0){
@@ -745,10 +746,14 @@
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"));
- HashMap<String, Object> hashMap1 = new HashMap<>();
- hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
- list.add(hashMap1);
flag = true;
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)r.get("dayTime"));
+ inspectionResultVo.setInsResult((String)r.get("insResult"));
+ listS.add(inspectionResultVo);
+
+ map1.put("dataList",listS);
+
}
}
if(flag == false){
@@ -757,9 +762,10 @@
hashMap.put("detectionStandard",r.get("detectionStandard"));
// hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
- HashMap<String, Object> hashMap1 = new HashMap<>();
- hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
- list.add(hashMap1);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)r.get("dayTime"));
+ inspectionResultVo.setInsResult((String)r.get("insResult"));
+ listS.add(inspectionResultVo);
maps.add(hashMap);
}
}else{
@@ -768,10 +774,11 @@
hashMap.put("detectionStandard",r.get("detectionStandard"));
// hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
- HashMap<String, Object> hashMap1 = new HashMap<>();
- hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
- list.add(hashMap1);
- hashMap.put("dataList",list);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)r.get("dayTime"));
+ inspectionResultVo.setInsResult((String)r.get("insResult"));
+ listS.add(inspectionResultVo);
+ hashMap.put("dataList",listS);
maps.add(hashMap);
}
@@ -782,26 +789,45 @@
List<Map<String, Object>> getUserQianzi(String num,String cycleUnit){
List<Map<String, Object>> maps2 = new ArrayList<>();
+ List<InspectionResultVo> listIn = new ArrayList<>();
List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
for (Map<String, Object> map : userQianZi) {
if(maps2.size()>0){
Boolean flag = false;
for (Map<String, Object> map1 : maps2) {
if(map1.containsValue("缁存姢璐ｄ换浜虹瀛�")){
- map1.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+// map1.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
flag = true;
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ listIn.add(inspectionResultVo);
+
+ map1.put("dataList",listIn);
}
}
if(flag == false){
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("inspectionUserName","缁存姢璐ｄ换浜虹瀛�");
- hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
- maps2.add(hashMap);
+// hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+// maps2.add(hashMap);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ listIn.add(inspectionResultVo);
+ hashMap.put("dataList",listIn);
}
}else{
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("inspectionUserName","缁存姢璐ｄ换浜虹瀛�");
- hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+// hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+// maps2.add(hashMap);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
+ listIn.add(inspectionResultVo);
+ hashMap.put("dataList",listIn);
+
maps2.add(hashMap);
}
}
@@ -810,26 +836,45 @@
List<Map<String, Object>> getCheckUserQianzi(String num,String cycleUnit){
List<Map<String, Object>> maps3 = new ArrayList<>();
+ List<InspectionResultVo> listRe = new ArrayList<>();
List<Map<String, Object>> checkUserQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
for (Map<String, Object> map : checkUserQianZi) {
if(maps3.size()>0){
Boolean flag = false;
for (Map<String, Object> map1 : maps3) {
if(map1.containsValue("妫�鏌ヨ矗浠讳汉绛惧瓧")){
- map1.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+// map1.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ listRe.add(inspectionResultVo);
+
+ map1.put("dataList",listRe);
flag = true;
}
}
if(flag == false){
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("repairConfirmPerson","妫�鏌ヨ矗浠讳汉绛惧瓧");
- hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
- maps3.add(hashMap);
+// hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+// maps3.add(hashMap);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ listRe.add(inspectionResultVo);
+ hashMap.put("dataList",listRe);
}
}else{
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("repairConfirmPerson","妫�鏌ヨ矗浠讳汉绛惧瓧");
- hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+// hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+// maps3.add(hashMap);
+ InspectionResultVo inspectionResultVo = new InspectionResultVo();
+ inspectionResultVo.setDayTime((String)map.get("dayTime"));
+ inspectionResultVo.setRepairConfirmPerson((String)map.get("repairConfirmPerson"));
+ listRe.add(inspectionResultVo);
+ hashMap.put("dataList",listRe);
+
maps3.add(hashMap);
}
}
--
Gitblit v1.9.3