认证-参数收集清单-填写人导出导入修改

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,6 +3735,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			countError++;
 		}
 
+		if (StringUtils.isNotEmpty(value)) {
 			//判断是否是单选
 			if (isSingle) {
 				if (StringUtils.isNotBlank(value) && value.contains(",")) {
@@ -3759,7 +3760,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				// 判断是否符合备选值
 				value = value.replaceAll("！", "!");
 				List<String> valueList = Arrays.asList(value.split("!"));
-			for(String v : valueList) {
+				for (String v : valueList) {
 					if (!controlValueList.contains(v)) {
 						if (CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += configName + "下拉多选中的" + value + "不正确；";
@@ -3774,6 +3775,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 //				}
 				}
 			}
+		}
 
 //		resultMap.put("value", newValue.toString());
 		resultMap.put("errorMsg", errorMsg);
@@ -3806,6 +3808,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			countError++;
 		}
 
+		if (StringUtils.isNotEmpty(value)) {
 			String regex = "";
 			Boolean result = false;
 			Boolean flag = false;
@@ -3853,7 +3856,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					errorMsg += configName + " did not match the Validate Component in the system; ";
 					countError++;
 				} else {
-				if(!result) {
+					if (!result) {
 						errorMsg += configName + " Validate Component is wrong; ";
 						countError++;
 					}
@@ -3864,12 +3867,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					errorMsg += configName + "未匹配到系统中的控件校验；";
 					countError++;
 				} else {
-				if(!result) {
+					if (!result) {
 						errorMsg += configName + "文本的控件校验不正确；";
 						countError++;
 					}
 				}
 			}
+		}
 
 		resultMap.put("errorMsg", errorMsg);
 		resultMap.put("countError", countError);