预测维护修改

yangkang

2023-09-13 51ebb09a85d622cae75dc169b4c86723977d3756

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

@@ -192,6 +192,12 @@
       return Result.OK(pageList);
    }

    @GetMapping(value = "/pageEquipment")
    public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
       IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
       return Result.OK(pageList);
    }

   /**
    *   添加
    *
@@ -589,12 +595,8 @@
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保开始日期缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyEnd())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保结束日期缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                else if(StringUtils.isBlank(equipmentImportVo.getKeyEquipmentIdentification())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:关键设备标识缺失,请填写必填项后再导入;";
                else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资产状态缺失,请填写必填项后再导入;";
                   exceptionNum++;
                }
                     //非必填项
@@ -651,52 +653,65 @@
                       exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备所属类别不存在，请先维护设备类别;";
                       exceptionNum++;
                     }
                      else{
                   Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
                   if(ObjectUtils.isNull(oriEquipment)){
                      Equipment equipment = new Equipment();
                      equipment.setNum(equipmentImportVo.getNum())
                            .setName(equipmentImportVo.getName())
                            .setUseId(equipmentImportVo.getUseId())
                            .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
                            .setManageId(equipmentImportVo.getManageId())
                            .setTeamId(equipmentImportVo.getTeamId())
                            .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
                            .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                            .setEquipmentCategoryId(equipmentCategory.getId())
                            .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
                            .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
                            .setCoolingSystem(equipmentImportVo.getCoolingSystem())
                            .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
                            .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
                            .setOperatingSystem(equipmentImportVo.getOperatingSystem())
                            .setSystem(equipmentImportVo.getSystem())
                            .setPort(equipmentImportVo.getPort())
                            .setCoordinateNum(equipmentImportVo.getCoordinateNum())
                            .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
                            .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
                            .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
                            .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
                            .setLocation(equipmentImportVo.getLocation())
                            .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
                            .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
                            .setFundSource(equipmentImportVo.getFundSource())
                            .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
                            .setFactoryNumber(equipmentImportVo.getFactoryNumber())
                            .setConstructorId(equipmentImportVo.getConstructorId())
                            .setSourceCountry(equipmentImportVo.getSourceCountry())
                            .setModel(equipmentImportVo.getModel())
                            .setSpecification(equipmentImportVo.getSpecification())
                            .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                            .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                            .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                            .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                            .setGpo(equipmentImportVo.getGpo());
                      equipmentService.save(equipment);
                   }else {
                      exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败，原因：统一编码已存在，数据重复导入;";
                      exceptionNum++;
                else{
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                      if(
                            ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
                            ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
                      ){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备处于质保期，质保信息缺失，请先维护质保开始时间或结束时间;";
                         exceptionNum++;
                      }

                   }else{
                      Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
                      if(ObjectUtils.isNull(oriEquipment)){
                         Equipment equipment = new Equipment();
                         equipment.setNum(equipmentImportVo.getNum())
                               .setName(equipmentImportVo.getName())
                               .setUseId(equipmentImportVo.getUseId())
                               .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
                               .setManageId(equipmentImportVo.getManageId())
                               .setTeamId(equipmentImportVo.getTeamId())
                               .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
                               .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                               .setEquipmentCategoryId(equipmentCategory.getId())
                               .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
                               .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
                               .setCoolingSystem(equipmentImportVo.getCoolingSystem())
                               .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
                               .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
                               .setOperatingSystem(equipmentImportVo.getOperatingSystem())
                               .setSystem(equipmentImportVo.getSystem())
                               .setPort(equipmentImportVo.getPort())
                               .setCoordinateNum(equipmentImportVo.getCoordinateNum())
                               .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
                               .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
                               .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
                               .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
                               .setLocation(equipmentImportVo.getLocation())
                               .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
                               .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
                               .setFundSource(equipmentImportVo.getFundSource())
                               .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
                               .setFactoryNumber(equipmentImportVo.getFactoryNumber())
                               .setConstructorId(equipmentImportVo.getConstructorId())
                               .setSourceCountry(equipmentImportVo.getSourceCountry())
                               .setModel(equipmentImportVo.getModel())
                               .setSpecification(equipmentImportVo.getSpecification())
                               .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                               .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                               .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                               .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                               .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                               .setGpo(equipmentImportVo.getGpo());
                         equipmentService.save(equipment);
                      }else {
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败，原因：统一编码已存在，数据重复导入;";
                         exceptionNum++;
                      }
                   }

                }
             }
             if(exceptionNum!=0){