diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 2ce912df..5fbb1452 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -335,10 +335,11 @@ public class SafetyCenterSubitemService extends ServiceImpl 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 parentContactIdList = new ArrayList<>(); if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) { @@ -386,9 +387,14 @@ public class SafetyCenterSubitemService extends ServiceImpl 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