点检报表 数据格式修改

qushaowei

2025-05-26 10785ed3389ab40c0b647d7e9783dd8045bf2b67

 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> list = new ArrayList<>();

          for (Map<String, Object> r : record) {
             if(maps.size()>0){
@@ -745,9 +746,10 @@
                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);
                      InspectionResultVo inspectionResultVo = new InspectionResultVo();
                      inspectionResultVo.setDayTime((String)r.get("dayTime"));
                      inspectionResultVo.setInsResult((String)r.get("detectionStandard"));
                      list.add(inspectionResultVo);
                      flag = true;
                   }
                }
@@ -757,9 +759,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("detectionStandard"));
                   list.add(inspectionResultVo);
                   maps.add(hashMap);
                }
             }else{
@@ -768,9 +771,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("detectionStandard"));
                list.add(inspectionResultVo);
                hashMap.put("dataList",list);

                maps.add(hashMap);