qushaowei
2025-06-10 7542603a0f22dd73287556c9ec0df39184091ab0
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);
@@ -752,16 +761,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,8 +787,11 @@
//                   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);
                   hashMap.put("dataList",listS);//----
                   maps.add(hashMap);
                }
             }else{
@@ -790,6 +803,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 +828,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,7 +842,9 @@
               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);//---
               hashMap.put("dataList",listIn);
            }
         }else{
@@ -838,6 +855,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 +878,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,8 +893,11 @@
                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);
                maps3.add(hashMap);//---
             }
          }else{
             HashMap<String, Object> hashMap = new HashMap<>();
@@ -885,6 +907,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);