From d000f6408f4baa0a0f87d4eda39bc8b9b543ed5b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期五, 30 五月 2025 09:51:01 +0800 Subject: [PATCH] 设备管理后端修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 5 +++++ 1 files changed, 5 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..db5a03c 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 @@ -781,6 +781,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 +835,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 +887,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