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/controller/EamEquipmentController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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())
--
Gitblit v1.9.3