WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数项-标题类型校验修改

Browse Source
This commit is contained in:
liyawei
2022-08-09 10:50:19 +08:00
parent 42819e62e9
commit ea7999c5e2
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+13 -10
View File
@@ -1171,7 +1171,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<String> stringMessage = new ArrayList<>(); List<String> stringMessage = new ArrayList<>();
List<String> nioNumberImport = new ArrayList<>(); // 记录导入的nio编号 List<String> nioNumberImport = new ArrayList<>(); // 记录导入的nio编号
int i = 1; //记录行号 int i = 2; //记录行号
//循环验证数据 //循环验证数据
for (ParamsInfoCnImport dto : paramsInfoEOList) { for (ParamsInfoCnImport dto : paramsInfoEOList) {
//判断此行数据是否全部为空,是则不读取 //判断此行数据是否全部为空,是则不读取
@@ -1278,13 +1278,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
errorMsg += (String)resultMap.get("errorMsg"); errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError"); countError += (int)resultMap.get("countError");
// 认证类别
// 来源：认证类别sheet页
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
// String certCategory = dto.getCertCategory(); // String certCategory = dto.getCertCategory();
// resultMap = validateMustAndLength(certCategory, "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut); // resultMap = validateMustAndLength(certCategory, "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut);
// errorMsg += (String)resultMap.get("errorMsg"); // errorMsg += (String)resultMap.get("errorMsg");
@@ -1306,6 +1299,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
controlType = (String)resultMap.get("value"); controlType = (String)resultMap.get("value");
dto.setControlType(controlType); dto.setControlType(controlType);
// 认证类别
// 来源：认证类别sheet页
if (ControlTypeEnum.Title.getValue().equals(controlType)) {
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.NO.getValue(), "1000", false, cut);
} else {
resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
}
errorMsg += (String)resultMap.get("errorMsg");
countError += (int)resultMap.get("countError");
dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
// 控件备选值 // 控件备选值
String controlValues = dto.getControlValues(); String controlValues = dto.getControlValues();
if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType) if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)
@@ -1352,7 +1356,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
dto.setControlVerify(null); dto.setControlVerify(null);
} }
// 标题默认值 // 标题默认值
String titleDefaultValue = dto.getTitleDefaultValue(); String titleDefaultValue = dto.getTitleDefaultValue();
if (ControlTypeEnum.Title.getValue().equals(controlType)) { if (ControlTypeEnum.Title.getValue().equals(controlType)) {
@@ -1427,7 +1430,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
List<String> ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号 List<String> ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号
int j = 1; int j = 2;
for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) {
//判断此行数据是否全部为空,是则不读取 //判断此行数据是否全部为空,是则不读取
if (checkObjAllFieldsIsNull(ccDto)) { if (checkObjAllFieldsIsNull(ccDto)) {