From a5152885f97c113bd9397c8c1c6a263a49a9829c Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 28 Oct 2022 15:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=A1=AB=E5=86=99=E4=BA=BA?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 160 +++++++++---------
 1 file changed, 82 insertions(+), 78 deletions(-)

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