diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index e2275259b..dbe686dee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1833,20 +1833,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO); + importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); } private void importDatas(List dataList, - List categoryList, List dictItemList, String zipEntryName, File saveDirectory, @@ -1868,6 +1863,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + message = errorMsg + "子标题不能超过100个字符"; + }else{ + message = errorMsg + " Subheadings cannot be checked more than 100 characters"; + } + msgList.add(message); + } + } + //WVTA ID + if(StringUtils.isNotBlank(wvtaId)){ + if(wvtaId.length() > 100){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + message = errorMsg + "WVTA ID不能超过100个字符"; + }else{ + message = errorMsg + " The WVTA ID cannot contain more than 100 characters"; + } + msgList.add(message); + } + } + //备注 remark + if(StringUtils.isNotBlank(remark)){ + if(remark.length() > 300){ + String message = ""; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + message = errorMsg + "备注不能超过300个字符"; + }else{ + message = errorMsg + " Note The value cannot exceed 300 characters"; + } + msgList.add(message); + } + } //实施类别(单选不必填) value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type"); if(StringUtils.isNotBlank(value)){ projectLawsInventoryEO.setImplementType(value); } - - //新车实施日期 xin1Che1Xing2Shi2Shi1Ri4Qi1 -// flag = dateVerify(dummyInventoryInfoEO, errorMsg, xin1Che1Xing2Shi2Shi1Ri4Qi1,msgList,"新车实施日期","new car implementation date"); -// if(flag){ -// dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(xin1Che1Xing2Shi2Shi1Ri4Qi1); -// } - - //在产车实施日期 implementTime -// flag = dateVerify(dummyInventoryInfoEO, errorMsg, implementTime,msgList,"在产车实施日期","on the production vehicle implementation date"); -// if(flag){ -// dummyInventoryInfoEO.setImplementTime(implementTime); -// } //认证类型(单选不必填) value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type"); if(StringUtils.isNotBlank(value)){