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-system/lxzn-system-start/src/main/resources/application-dev.yml | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 28 ++++++++++++++--------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 9 +++++++--
3 files changed, 23 insertions(+), 18 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())
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 700f0e7..9cc9f70 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -68,6 +68,7 @@
/**鎵�灞炲垎绫�*/
@Excel(name = "鎵�灞炲垎绫�", width = 15)
@ApiModelProperty(value = "鎵�灞炲垎绫�")
+ @Dict(dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
private String equipmentCategoryId;
/**鐗圭璁惧*/
@Excel(name = "鐗圭璁惧锛堟槸銆佸惁锛�", width = 15)
@@ -269,6 +270,10 @@
private BigDecimal coordinateNum;
@ApiModelProperty(value = "绔嬮」鍗″彿")
private String projectApprovalNo;
-
-
+ private String standardA;
+ private String standardB;
+ private String standardC;
+ private String standardD;
+ private String standardE;
+ private String standardF;
}
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 8e154cd..de4eb0f 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -188,9 +188,9 @@
app: http://localhost:8051
path:
#鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆
- upload: /opt/upFiles
+ upload: C://opt//upFiles
#webapp鏂囦欢璺緞
- webapp: /opt/webapp
+ webapp: C://opt//upFiles
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#闃块噷浜憃ss瀛樺偍鍜屽ぇ楸肩煭淇＄閽ラ厤缃�
--
Gitblit v1.9.3