diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index bdeb49541..e6736d272 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -257,7 +257,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl setDefault(String otaId) { List list = this.getByOtaId(otaId); Date now = new Date(); @@ -224,7 +225,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut,errMsg); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override @@ -243,7 +244,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl(); } - List newList = parseFile(upFile, otaId, cut,errMsg); + List newList = parseFile(upFile, otaId, cut, errMsg); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); deleteByOtaId(otaId); @@ -283,7 +284,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl { } } - public void checkError(T clazz, StringBuilder errMsg, ISysDictService sysDictService, String cut) { + public void checkError(T clazz, StringBuilder errMsg, ISysDictService sysDictService, String cut,int row) { Field[] fields = clazz.getClass().getDeclaredFields(); for (Field field : fields) { OtaTitleEnum ote = OtaTitleEnum.getOtaTitleEnum(field.getName()); @@ -200,17 +200,29 @@ public class ComparisonUtil { String str = val.toString(); if ("0".equals(ote.getType())) { if (str.length() > ote.getLen()) { - errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 的长度超过了 " + ote.getLen() + ", "); + } else { + errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); + } field.set(clazz, null); } } else if ("1".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { - errMsg.append(title + " 必须填写有或无, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 必须填写有或无, "); + }else{ + errMsg.append(title + " 必须填写有或无, "); + } field.set(clazz, null); } } else if ("2".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { - errMsg.append(title + " 必须填写是或否, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 必须填写是或否, "); + }else{ + errMsg.append(title + " 必须填写是或否, "); + } field.set(clazz, null); } } else if ("3".equals(ote.getType())) { @@ -220,7 +232,11 @@ public class ComparisonUtil { for (String s : strs) { String res = sysDictService.queryDictTextByKeyEn(ote.getType(), s, cut); if (StringUtils.isEmpty(res)) { - errMsg.append(title + " 填写了无法识别的选项, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 填写了无法识别的选项, "); + }else{ + errMsg.append(title + " 填写了无法识别的选项, "); + } field.set(clazz, null); } }