导入字段校验调整

“linengliang”

2023-09-06 2be3886789a49856d5745f552051edd4ebfe1630

 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())