diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 7439987fc..77ef0e983 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4382,18 +4382,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than " + dbLength + " char"; + errorMsg += key + " Can not be more than " + dbLength + " char, "; } countError++; } @@ -4402,9 +4402,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than" + dbLength + "char"; + errorMsg += key + " Can not be more than" + dbLength + "char, "; } countError++; } @@ -4452,27 +4452,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than" + dbLength + " char"; + errorMsg += key + " Can not be more than" + dbLength + " char, "; } countError++; } //判断是否是单选 if (StringUtils.isNotBlank(value) && value.contains(",")) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "为单选项"; + errorMsg += key + "为单选项, "; }else{ - errorMsg += key + " Is multiple Choice"; + errorMsg += key + " Is multiple choice, "; } countError++; @@ -4481,9 +4481,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than" + dbLength + " char"; + errorMsg += key + " Can not be more than" + dbLength + " char, "; } countError++; } @@ -4520,9 +4520,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than " + dbLength + " char"; + errorMsg += key + " Can not be more than " + dbLength + " char, "; } countError++; } @@ -4623,9 +4623,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "压缩包中没有" + fileName + "文件; "; + errorMsg += key + "压缩包中没有" + fileName + "文件, "; }else{ - errorMsg += key + " Not in the zip package" + fileName + "file; "; + errorMsg += key + " Not in the zip package" + fileName + "file, "; } countError++; } else { @@ -4654,18 +4654,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += key + "不能超过" + dbLength + "个字符"; + errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ - errorMsg += key + " Can not be more than " + dbLength + " char"; + errorMsg += key + " Can not be more than " + dbLength + " char, "; } countError++; } @@ -4702,7 +4702,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0) { - msgList.add(errorMsg); + if(errorMsg.endsWith(", ")){ + String substring = errorMsg.substring(0, errorMsg.length() - 2); + msgList.add(substring); + }else{ + msgList.add(errorMsg); + } } mapList.add(mapResult); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index e9fce508c..7d98957bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1033,9 +1033,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "子标题不能超过100个字符"; + message = errorMsg + "子标题不能超过100个字符, "; }else{ - message = errorMsg + " Subheadings cannot be checked more than 100 characters"; + message = errorMsg + " Subheadings cannot be checked more than 100 characters, "; } msgList.add(message); } @@ -1045,9 +1045,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符"; + message = errorMsg + "WVTA ID不能超过100个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters"; + message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; } msgList.add(message); } @@ -1057,9 +1057,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 300){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符"; + message = errorMsg + "备注不能超过300个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters"; + message = errorMsg + " Note The value cannot exceed 300 characters, "; } msgList.add(message); } @@ -1317,18 +1317,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getName())).collect(Collectors.toList()); if(collect.size() == 0){ if (CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())) { - errorMsg += "技术领域中的" + technologyTerritory + "与数据字典不匹配"; + errorMsg += "技术领域中的" + technologyTerritory + "与数据字典不匹配, "; } else { - errorMsg += " In the field of technology " + technologyTerritory + " does not match the data dictionary"; + errorMsg += " In the field of technology " + technologyTerritory + " does not match the data dictionary, "; } msgList.add(errorMsg); }else{ @@ -1344,18 +1344,18 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); if (collect.size() == 0) { if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ - errorMsg += nameCn + "中的" + value + "与数据字典不匹配"; + errorMsg += nameCn + "中的" + value + "与数据字典不匹配, "; }else{ - errorMsg += nameEn +" "+ value + " does not match the data dictionary"; + errorMsg += nameEn +" "+ value + " does not match the data dictionary, "; } msgList.add(errorMsg); }else{ @@ -1379,9 +1379,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl finalValueList = valueList; List diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList()); if (CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())) { - errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配"; + errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, "; } else { - errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary"; + errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, "; } msgList.add(errorMsg); } @@ -1395,9 +1395,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "子标题不能超过100个字符"; + message = errorMsg + "子标题不能超过100个字符, "; }else{ - message = errorMsg + " Subheadings cannot be checked more than 100 characters"; + message = errorMsg + " Subheadings cannot be checked more than 100 characters, "; } msgList.add(message); } @@ -2504,9 +2504,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 100){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符"; + message = errorMsg + "WVTA ID不能超过100个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters"; + message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; } msgList.add(message); } @@ -2516,9 +2516,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符"; + message = errorMsg + "备注不能超过300个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters"; + message = errorMsg + " Note The value cannot exceed 300 characters, "; } msgList.add(message); } @@ -2651,7 +2651,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl finalValueList = valueList; List diffList = list.stream().filter(e -> !finalValueList.contains(e)).collect(Collectors.toList()); if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { - errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配"; + errorMsg += nameCn + "中的" + StringUtils.join(diffList,",") + "与数据字典不匹配, "; } else { - errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary"; + errorMsg += nameEn + " " + StringUtils.join(diffList,",") + " does not match the data dictionary, "; } msgList.add(errorMsg); } @@ -2907,18 +2907,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); if (collect.size() == 0) { if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += nameCn + "中的" + value + "与数据字典不匹配"; + errorMsg += nameCn + "中的" + value + "与数据字典不匹配, "; }else{ - errorMsg += nameEn +" "+ value + " does not match the data dictionary"; + errorMsg += nameEn +" "+ value + " does not match the data dictionary, "; } msgList.add(errorMsg); }else{