fix 86986 功能安全中心--成员维护-导入-两个备注没有做位数限制
This commit is contained in:
+11
-5
@@ -335,10 +335,11 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId);
|
||||
if (this.count(wrapper) > 0){
|
||||
errorMessage.add("第" + errorRowNum + "行:成员单位当前项目中已经存在");
|
||||
errorRowNum2 += contactsList.size();
|
||||
continue;
|
||||
}
|
||||
|
||||
String remarks1 = subitemImport.getRemarks();
|
||||
if (remarks1 != null && remarks1.length() > 200){
|
||||
errorMessage.add("第" + errorRowNum + "行:成员单位备注最长为200字符");
|
||||
}
|
||||
Integer projectType = safetyCenter.getProjectType();
|
||||
List<String> parentContactIdList = new ArrayList<>();
|
||||
if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) {
|
||||
@@ -386,9 +387,14 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
continue;
|
||||
}
|
||||
}
|
||||
String remarks = contactsImport.getRemarks();
|
||||
if (remarks != null && remarks.length() > 50){
|
||||
errorMessage.add("第" + errorRowNum2 + "行:企业联系人备注最长为50字符");
|
||||
continue;
|
||||
}
|
||||
SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts();
|
||||
contacts1.setContactsId(payContactsManagement.getId());
|
||||
contacts1.setRemarks(contactsImport.getRemarks());
|
||||
contacts1.setRemarks(remarks);
|
||||
subitemContactsList.add(contacts1);
|
||||
}
|
||||
if (!errorMessage.isEmpty()){
|
||||
@@ -397,7 +403,7 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
SafetyCenterSubitem subitem = new SafetyCenterSubitem();
|
||||
subitem.setProjectId(projectId);
|
||||
subitem.setCompanyId(companyId);
|
||||
subitem.setRemarks(subitemImport.getRemarks());
|
||||
subitem.setRemarks(remarks1);
|
||||
subitem.setContactsList(subitemContactsList);
|
||||
try {
|
||||
this.add(subitem);
|
||||
|
||||
Reference in New Issue
Block a user