From d1c8237871f3f2370b8ef7a9e534c4bc29bfc467 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 25 八月 2023 18:13:59 +0800
Subject: [PATCH] 设备台账2.0
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index deb81e9..932a158 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/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())
--
Gitblit v1.9.3