标准修改

qushaowei

2023-12-13 b77e8c2ce35ca1b7b5737a3d0b91fd584908f454

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

@@ -21,6 +21,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -168,11 +169,29 @@
    @Transactional(rollbackFor = {Exception.class})
    public Result<String> add(@RequestBody MaintenanceStandard maintenanceStandard) {
//        maintenanceStandard.setType("daily");

        String maintenanceType = maintenanceStandard.getMaintenanceType();
        String equipmentId = maintenanceStandard.getEquipmentId();
        List<MaintenanceStandard> maintenanceStandards = maintenanceStandardService.lambdaQuery()
                .eq(MaintenanceStandard::getEquipmentId, equipmentId)
                .eq(MaintenanceStandard::getMaintenanceType, maintenanceType)
                .eq(MaintenanceStandard::getDelFlag, "0")
                .eq(MaintenanceStandard::getVersionStatus, "2").list();
        if(maintenanceStandards.size() > 0){
            return Result.error("保养标准已存在不允许重复提交！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        maintenanceStandard.setWritePerson(sysUser.getRealname());
        maintenanceStandard.setAssignMode("1");
        maintenanceStandardService.save(maintenanceStandard);

        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
            if(maintenanceCycle.size() > 0){
                maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
            }
            maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
            maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto());
            maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
@@ -200,8 +219,13 @@
            maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail);
        }
        //2.重新持久保养项目
        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        List<MaintenanceStandardDetail> maintenanceStandardDetails = maintenanceStandard.getMaintenanceStandardDetaillist();
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetails) {
            if(maintenanceCycle.size() > 0){
                maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
            }
            maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
            maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
        }
@@ -545,15 +569,20 @@
        //明细信息
        List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
        MaintenanceStandardDetail isd = null;
        Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
        List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) {
            isd = new MaintenanceStandardDetail();
            isd.setMaintenanceStandardId(maintenanceStandard.getId());
            isd.setLocation(maintenanceStandardDetail.getLocation());
            isd.setPhoto(maintenanceStandardDetail.getPhoto());
            isd.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
            isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
//            isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
            isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode());
            isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire());
            if(maintenanceCycle.size() > 0){
                isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
            }
            maintenanceStandardDetailService.save(isd);
        }
        if(CollectionUtils.isNotEmpty(maintenanceStandardPlanningMaterialList)){