设备车间管理与用户

lyh

2025-06-30 fe65bb1d764ca9d32647818240bb551db06e0b7c

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

@@ -155,6 +155,22 @@
      streamService.save(stream);
       List<ABCAssessment> abcAssessmentList = stream.getAssessmentList();
       for(ABCAssessment abcAssessment:abcAssessmentList){
          Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
          boolean isD = "D".equals(abcAssessment.getFinalStandard());
          boolean a = StringUtils.isNotBlank(equipment.getStandardA())&&StringUtils.isNotBlank(abcAssessment.getStandardA())&&equipment.getStandardA().equals(abcAssessment.getStandardA());
         boolean b = StringUtils.isNotBlank(equipment.getStandardB())&&StringUtils.isNotBlank(abcAssessment.getStandardB())&&equipment.getStandardB().equals(abcAssessment.getStandardB());
         boolean c = StringUtils.isNotBlank(equipment.getStandardC())&&StringUtils.isNotBlank(abcAssessment.getStandardC())&&equipment.getStandardC().equals(abcAssessment.getStandardC());
         boolean d = StringUtils.isNotBlank(equipment.getStandardD())&&StringUtils.isNotBlank(abcAssessment.getStandardD())&&equipment.getStandardD().equals(abcAssessment.getStandardD());
         boolean e = StringUtils.isNotBlank(equipment.getStandardE())&&StringUtils.isNotBlank(abcAssessment.getStandardE())&&equipment.getStandardE().equals(abcAssessment.getStandardE());
         boolean f = StringUtils.isNotBlank(equipment.getStandardF())&&StringUtils.isNotBlank(abcAssessment.getStandardF())&&equipment.getStandardF().equals(abcAssessment.getStandardF());
          if(isD&&a&&b&&c&&d&&e&&f){
             abcAssessment.setStandardA(null);
            abcAssessment.setStandardB(null);
            abcAssessment.setStandardC(null);
            abcAssessment.setStandardD(null);
            abcAssessment.setStandardE(null);
            abcAssessment.setStandardF(null);
         }
          abcAssessment.setStreamId(stream.getId());
      }
       aBCAssessmentService.saveBatch(abcAssessmentList);
@@ -615,7 +631,7 @@
            List<EquipmentMaintenancePlanDetail> details = new ArrayList<>();
             for(ABCAssessment abcAssessment:abcAssessments){
               Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
               String oldStandard = equipment.getEquipmentImportanceId();
               String oldStandard = abcAssessment.getOldStandard();
               String newStandard = abcAssessment.getFinalStandard();
               LocalDate currentDate = LocalDate.now();

@@ -628,11 +644,10 @@
               Date nextDayAsDate =Date.from(nextDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
               Date nextMonthAsDate = Date.from(nextMonth.atStartOfDay(ZoneId.systemDefault()).toInstant());
               Date needingDate = equipment.getNextThirdMaintenanceTime();
               Boolean a = StringUtils.isNotBlank(oldStandard);
               Boolean b = oldStandard.equals("B")||oldStandard.equals("C");
               Boolean c = newStandard.equals("A");
               Boolean d = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
               if(a&&b&&c&&d){
               Boolean a = StringUtils.isNotBlank(oldStandard)&&(oldStandard.equals("B")||oldStandard.equals("C"));
               Boolean b = StringUtils.isNotBlank(newStandard)&&newStandard.equals("A");;
               Boolean c = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
               if(a&&b&&c){
                  EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail = new EquipmentMaintenancePlanDetail();
                  equipmentMaintenancePlanDetail.setPlanId(hexString);
                  equipmentMaintenancePlanDetail.setEquipmentId(equipment.getId());