From 2be3886789a49856d5745f552051edd4ebfe1630 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 10:43:14 +0800
Subject: [PATCH] 导入字段校验调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 7 ++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 9 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 19 ++++++++++---------
3 files changed, 25 insertions(+), 10 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 4e74994..9bceb45 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
@@ -573,6 +573,14 @@
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
}
+ else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getKeyEquipmentIdentification())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍏抽敭璁惧鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
//闈炲繀濉」
// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍔熻兘浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
@@ -637,6 +645,7 @@
.setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
.setManageId(equipmentImportVo.getManageId())
.setTeamId(equipmentImportVo.getTeamId())
+ .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
.setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
.setEquipmentCategoryId(equipmentCategory.getId())
.setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
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 b32b909..604e31b 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
@@ -52,12 +52,13 @@
@ApiModelProperty(value = "璁惧瑙勬牸")
private String specification;
/**璁惧鐘舵��*/
- @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17")
+ @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17",dicCode = "equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
@Dict(dicCode = "equipment_status")
private String equipmentStatus;
/**鎶�鏈姸鎬�*/
@ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Excel(name = "鎶�鏈姸鎬�", width = 15,orderNum = "18",dicCode = "technology_status")
@Dict(dicCode = "technology_status")
private String technologyStatus;
/**璧勪骇缂栧彿*/
@@ -90,11 +91,11 @@
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNumber;
/**鍑哄巶鏃ユ湡*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "22")
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "23")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
/**楠屾敹鏃ユ湡*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "25")
+ @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "26")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
/**鎵�鏈夌粍缁�*/
@@ -120,7 +121,7 @@
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String functionary;
/**浣嶇疆*/
- @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "21")
+ @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "22")
@ApiModelProperty(value = "浣嶇疆")
private String location;
/**閲嶈搴�*/
@@ -160,15 +161,15 @@
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String equipmentUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "閲嶉噺", width = 15,orderNum = "18")
+ @Excel(name = "閲嶉噺", width = 15,orderNum = "19")
@ApiModelProperty(value = "澶囩敤瀛楁3")
private String equipmentUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "19")
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "20")
@ApiModelProperty(value = "澶囩敤瀛楁4")
private String equipmentUda4;
/**澶囩敤瀛楁5*/
- @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "20")
+ @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "21")
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String equipmentUda5;
/**绉熸埛id*/
@@ -225,7 +226,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealDate;
@ApiModelProperty(value = "璧勯噾鏉ユ簮")
- @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "24")
+ @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "25")
private String fundSource;
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNo;
@@ -264,7 +265,7 @@
@Excel(name = "鍧愭爣鏁伴噺", width = 15,orderNum = "16")
private BigDecimal coordinateNum;
@ApiModelProperty(value = "绔嬮」鍗″彿")
- @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "23")
+ @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "24")
private String projectApprovalNo;
private String standardA;
private String standardB;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 37e981e..f29d52d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -63,7 +63,7 @@
@Excel(name = "鍧愭爣鏁伴噺")
private BigDecimal coordinateNum;
- @Excel(name = "璁惧鐘舵��")
+ @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
private String equipmentStatus;
@Excel(name = "閲嶉噺")
@@ -108,6 +108,11 @@
@Excel(name = "鎬诲姛鐜�")
private String gpo;
+ @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
+ private String technologyStatus;
+
+
+
--
Gitblit v1.9.3