设备台账2.0

“linengliang”

2023-08-25 d1c8237871f3f2370b8ef7a9e534c4bc29bfc467

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

@@ -153,17 +153,17 @@
            eq.setPrecisionParametersTemplateName("");
         }

//         String processParametersTemplateId = eq.getProcessParametersTemplateId();
//         if(StringUtils.isNotBlank(processParametersTemplateId)){
//            ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
//            if(processParametersTemplate != null){
//               eq.setProcessParametersTemplateName(processParametersTemplate.getName());
//            }else{
//               eq.setProcessParametersTemplateName("");
//            }
//         }else{
//            eq.setProcessParametersTemplateName("");
//         }
         String processParametersTemplateId = eq.getProcessParametersTemplateId();
         if(StringUtils.isNotBlank(processParametersTemplateId)){
            ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
            if(processParametersTemplate != null){
               eq.setProcessParametersTemplateName(processParametersTemplate.getName());
            }else{
               eq.setProcessParametersTemplateName("");
            }
         }else{
            eq.setProcessParametersTemplateName("");
         }
         //查询封存原因和封存日期
         List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
               .eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();
@@ -580,7 +580,7 @@
                            .setTeamId(equipmentImportVo.getTeamId())
                            .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                            .setEquipmentCategoryId(equipmentCategory.getId())
                            .setKeyEquipmentIdentification(equipmentImportVo.getKeyEquipmentIdentification())
                            .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
                            .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
                            .setCoolingSystem(equipmentImportVo.getCoolingSystem())
                            .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
@@ -593,12 +593,12 @@
                            .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
                            .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
                            .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
                            .setEquipmentUda2(equipmentImportVo.getEquipmentUda2())
                            .setLocation(equipmentImportVo.getEquipmentUda2())
                            .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
                            .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
                            .setFundSource(equipmentImportVo.getFundSource())
                            .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
                            .setFactoryNo(equipmentImportVo.getFactoryNo())
                            .setFactoryNumber(equipmentImportVo.getFactoryNo())
                            .setConstructorId(equipmentImportVo.getConstructorId())
                            .setSourceCountry(equipmentImportVo.getSourceCountry())
                            .setModel(equipmentImportVo.getModel())