数据结构修改

qushaowei

2025-05-26 a72062286b8212d490804826b71c18f67e8f0fd2

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java

@@ -738,7 +738,7 @@
          String detectionStandard = (String)map.get("detectionStandard");
          List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(equipmentNum,name, detectionStandard,dataTime);

          List<InspectionResultVo> list = new ArrayList<>();
          List<InspectionResultVo> listS = new ArrayList<>();

          for (Map<String, Object> r : record) {
             if(maps.size()>0){
@@ -746,11 +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"));
                      flag = true;
                      InspectionResultVo inspectionResultVo = new InspectionResultVo();
                      inspectionResultVo.setDayTime((String)r.get("dayTime"));
                      inspectionResultVo.setInsResult((String)r.get("detectionStandard"));
                      list.add(inspectionResultVo);
                      flag = true;
                      inspectionResultVo.setInsResult((String)r.get("insResult"));
                      listS.add(inspectionResultVo);

                      map1.put("dataList",listS);

                   }
                }
                if(flag == false){
@@ -761,8 +764,8 @@
//                   hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
                   InspectionResultVo inspectionResultVo = new InspectionResultVo();
                   inspectionResultVo.setDayTime((String)r.get("dayTime"));
                   inspectionResultVo.setInsResult((String)r.get("detectionStandard"));
                   list.add(inspectionResultVo);
                   inspectionResultVo.setInsResult((String)r.get("insResult"));
                   listS.add(inspectionResultVo);
                   maps.add(hashMap);
                }
             }else{
@@ -773,9 +776,9 @@

                InspectionResultVo inspectionResultVo = new InspectionResultVo();
                inspectionResultVo.setDayTime((String)r.get("dayTime"));
                inspectionResultVo.setInsResult((String)r.get("detectionStandard"));
                list.add(inspectionResultVo);
                hashMap.put("dataList",list);
                inspectionResultVo.setInsResult((String)r.get("insResult"));
                listS.add(inspectionResultVo);
                hashMap.put("dataList",listS);

                maps.add(hashMap);
             }
@@ -786,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);
         }
      }
@@ -814,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);
          }
       }