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-10-28 15:12:07 +08:00
parent 3866b52dcc
commit a5152885f9
1 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+82 -78
View File
@@ -2408,7 +2408,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
+ "7.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n"; + "7.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
} }
XSSFRow row2 = sheetItems.createRow(1); XSSFRow row2 = sheetItems.createRow(1);
row2.setHeight((short) 1000); row2.setHeight((short) 2500);
Cell cell2 = row2.createCell(0); Cell cell2 = row2.createCell(0);
cell2.setCellStyle(cellStyle); cell2.setCellStyle(cellStyle);
cell2.setCellValue(new XSSFRichTextString(explanation)); cell2.setCellValue(new XSSFRichTextString(explanation));
@@ -3360,7 +3360,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
//获得所有数据 //获得所有数据
//从第4行开始获取，第一行是表头，第二行是填写说明, 第三行是填写示例 //从第4行开始获取，第一行是表头，第二行是填写说明, 第三行是填写示例
for (int x = 3; x <= totalRowNum; x++) { for (int x = 3; x <= totalRowNum; x++) {
map = new HashMap<String, Object>(); map = new LinkedHashMap<String, Object>();
//获得第i行对象 //获得第i行对象
Row row= sheet.getRow(x); Row row= sheet.getRow(x);
//如果一行里的所有单元格都为空则不放进list里面 //如果一行里的所有单元格都为空则不放进list里面
@@ -3735,43 +3735,45 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
countError++; countError++;
} }
//判断是否是单选 if (StringUtils.isNotEmpty(value)) {
if (isSingle) { //判断是否是单选
if (StringUtils.isNotBlank(value) && value.contains(",")) { if (isSingle) {
if (CutEnum.CN.getValue().equals(cut)) { if (StringUtils.isNotBlank(value) && value.contains(",")) {
errorMsg += configName + "为单选项；"; if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "为单选项；";
} else {
errorMsg += configName + " is single type; ";
}
countError++;
} else { } else {
errorMsg += configName + " is single type; "; // 判断是否符合备选值
if (!controlValueList.contains(value)) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "下拉单选中的" + value + "不正确；";
} else {
errorMsg += configName + " " + value + " is not correct; ";
}
countError++;
}
} }
countError++;
} else { } else {
// 判断是否符合备选值 // 判断是否符合备选值
if (!controlValueList.contains(value)) { value = value.replaceAll("！", "!");
if (CutEnum.CN.getValue().equals(cut)) { List<String> valueList = Arrays.asList(value.split("!"));
errorMsg += configName + "下拉单选中的" + value + "不正确；"; for (String v : valueList) {
} else { if (!controlValueList.contains(v)) {
errorMsg += configName + " " + value + " is not correct; "; if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "下拉多选中的" + value + "不正确；";
} else {
errorMsg += configName + " " + value + " is not correct; ";
}
countError++;
} }
countError++;
}
}
} else {
// 判断是否符合备选值
value = value.replaceAll("！", "!");
List<String> valueList = Arrays.asList(value.split("!"));
for(String v : valueList) {
if (!controlValueList.contains(v)) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "下拉多选中的" + value + "不正确；";
} else {
errorMsg += configName + " " + value + " is not correct; ";
}
countError++;
}
// else { // else {
// //
// newValue.append(v).append(","); // newValue.append(v).append(",");
// } // }
}
} }
} }
@@ -3806,67 +3808,69 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
countError++; countError++;
} }
String regex = ""; if (StringUtils.isNotEmpty(value)) {
Boolean result = false; String regex = "";
Boolean flag = false; Boolean result = false;
if (ControlVerifyEnum.NULL.getValue().equals(controlVerify)) { Boolean flag = false;
result = true; if (ControlVerifyEnum.NULL.getValue().equals(controlVerify)) {
result = true;
} else if (ControlVerifyEnum.CHINESE.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.CHINESE.getValue().equals(controlVerify)) {
regex = "^[\\u4e00-\\u9fa5]{0,}$"; regex = "^[\\u4e00-\\u9fa5]{0,}$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.POSITIVE_INTEGER.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.POSITIVE_INTEGER.getValue().equals(controlVerify)) {
regex = "^[0-9]*$"; regex = "^[0-9]*$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.POSITIVE_FLOAT.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.POSITIVE_FLOAT.getValue().equals(controlVerify)) {
regex = "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$ 或 ^(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$"; regex = "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$ 或 ^(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.INTEGER_DECIMAL.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.INTEGER_DECIMAL.getValue().equals(controlVerify)) {
regex = "^(\\-|\\+)?\\d+(\\.\\d+)?$"; regex = "^(\\-|\\+)?\\d+(\\.\\d+)?$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.DECIMAL_ONE.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.DECIMAL_ONE.getValue().equals(controlVerify)) {
regex = "^(\\-)?\\d+(\\.\\d{1})$"; regex = "^(\\-)?\\d+(\\.\\d{1})$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.DECIMAL_TWO.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.DECIMAL_TWO.getValue().equals(controlVerify)) {
regex = "^(\\-)?\\d+(\\.\\d{2})$"; regex = "^(\\-)?\\d+(\\.\\d{2})$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.DECIMAL_THREE.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.DECIMAL_THREE.getValue().equals(controlVerify)) {
regex = "^(\\-)?\\d+(\\.\\d{3})$"; regex = "^(\\-)?\\d+(\\.\\d{3})$";
result = value.matches(regex); result = value.matches(regex);
} else if (ControlVerifyEnum.DECIMAL_FOUR.getValue().equals(controlVerify)) { } else if (ControlVerifyEnum.DECIMAL_FOUR.getValue().equals(controlVerify)) {
regex = "^(\\-)?\\d+(\\.\\d{4})$"; regex = "^(\\-)?\\d+(\\.\\d{4})$";
result = value.matches(regex); result = value.matches(regex);
} else {
flag = true;
}
if (CutEnum.EN.getValue().equals(cut)) {
if (flag) {
errorMsg += configName + " did not match the Validate Component in the system; ";
countError++;
} else { } else {
if(!result) { flag = true;
errorMsg += configName + " Validate Component is wrong; ";
countError++;
}
} }
} else { if (CutEnum.EN.getValue().equals(cut)) {
if (flag) { if (flag) {
errorMsg += configName + "未匹配到系统中的控件校验；"; errorMsg += configName + " did not match the Validate Component in the system; ";
countError++;
} else {
if(!result) {
errorMsg += configName + "文本的控件校验不正确；";
countError++; countError++;
} else {
if (!result) {
errorMsg += configName + " Validate Component is wrong; ";
countError++;
}
}
} else {
if (flag) {
errorMsg += configName + "未匹配到系统中的控件校验；";
countError++;
} else {
if (!result) {
errorMsg += configName + "文本的控件校验不正确；";
countError++;
}
} }
} }
} }