保养拆分

qushaowei

2024-01-11 792ff6e14b5074d30f8a7bd804d3b8e6454c3969

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

@@ -606,7 +606,7 @@

            // 将合并后的long值转换为16进制字符串
            String hexString = Long.toHexString(combinedBits);
            String planNum = sysIdentityService.getNumByTypeAndLength("",4);
            String planNum = sysIdentityService.getNumByTypeAndLength("MaintenancePlan",4);
            plan.setId(hexString);
            plan.setNum(planNum);
            plan.setType("3");
@@ -615,7 +615,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 +628,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());