Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 be8a6f171bd41aa50fb7310b2ccbe753dac20b89

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

@@ -199,11 +199,21 @@
        maintenanceStandard.setAssignMode("1");
        maintenanceStandardService.save(maintenanceStandard);

        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        if(maintenanceCycle.size()==0){
            return Result.OK("没有找到的保养周期，请先维护保养周期!");
        List<MaintenanceCycleVo> maintenanceCycle = null;
        if("2".equals(maintenanceType)){

            maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的二保保养周期，请先维护保养周期!");
            }
        }else{
            Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
            maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的三保保养周期，请先维护保养周期!");
            }
        }

        List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
            if(maintenanceCycle.size() > 0){
@@ -241,8 +251,24 @@
            maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail);
        }
        //2.重新持久保养项目
        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
//        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
//        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        List<MaintenanceCycleVo> maintenanceCycle = null;
        if("2".equals(maintenanceStandard.getMaintenanceType())){

            maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的二保保养周期，请先维护保养周期!");
            }
        }else{
            Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
            maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的三保保养周期，请先维护保养周期!");
            }
        }


        if(maintenanceCycle.size()==0){
            return Result.OK("没有找到的保养周期，请先维护保养周期!");
        }
@@ -622,8 +648,23 @@
        //明细信息
        List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
        MaintenanceStandardDetail isd = null;
        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());

//        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = null;
        if("2".equals(maintenanceStandard.getMaintenanceType())){

            maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的二保保养周期，请先维护保养周期!");
            }
        }else{
            Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
            maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
            if(maintenanceCycle.size()==0){
                return Result.error("没有找到的三保保养周期，请先维护保养周期!");
            }
        }
//        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) {
            isd = new MaintenanceStandardDetail();
            isd.setMaintenanceStandardId(maintenanceStandard.getId());
@@ -734,6 +775,16 @@
                dailyMaintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
                maintenanceStandardService.updateById(dailyMaintenanceStandard);
            }

            List<MaintenanceStandard> standards = maintenanceStandardService.lambdaQuery()
                    .eq(MaintenanceStandard::getEquipmentId, maintenanceStandard.getEquipmentId())
                    .eq(MaintenanceStandard::getVersionStatus, "2").list();
            for (MaintenanceStandard standard : standards) {
                standard.setVersionStatus("3");
                standard.setLoseEfficacyTime(new Date());
                standard.setLoseEfficacyPerson(sysUser.getRealname());
                maintenanceStandardService.updateById(standard);
            }
            maintenanceStandard.setApprovalPerson(sysUser.getRealname());
            maintenanceStandard.setVersionStatus("2");
            maintenanceStandard.setTakeEffectTime(new Date());