修改参数模版控件类型

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -4241,13 +4241,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			});
 
 			// 获取出最多行的配置列。
-			Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0);
-			String key = (String) paramsConfigDataMaxCountMap.get("key");
-			List<ParamsConfigDataEO> paramsConfigDataEOs = paramsConfigDataMap.get(key);
-			for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) {
-				ParamsCollectManifestEO paramsCollectManifestEOTemp = new ParamsCollectManifestEO();
-				BeanUtils.copyProperties(collectManifestEO,paramsCollectManifestEOTemp);
-				exportDataList.add(paramsCollectManifestEOTemp);
+			if(!paramsConfigDataCountList.isEmpty()){
+				Map<String, Object> paramsConfigDataMaxCountMap = paramsConfigDataCountList.get(0);
+				String key = (String) paramsConfigDataMaxCountMap.get("key");
+				List<ParamsConfigDataEO> paramsConfigDataEOs = paramsConfigDataMap.get(key);
+				for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataEOs) {
+					ParamsCollectManifestEO paramsCollectManifestEOTemp = new ParamsCollectManifestEO();
+					BeanUtils.copyProperties(collectManifestEO,paramsCollectManifestEOTemp);
+					exportDataList.add(paramsCollectManifestEOTemp);
+				}
 			}
 		}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java

@@ -106,7 +106,7 @@ public class ParamsInfoEO implements Serializable {
     private String certCategory;
 
 	/**控件类型*/
-    @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10","标题_11"})
+    @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","下拉单选+文本_5","下拉多选+文本_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","下拉单选+文本+附件_10","标题_11"})
     @ApiModelProperty(value = "控件类型")
     private String controlType;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java

@@ -15,12 +15,12 @@ public enum ControlTypeEnum {
     PULL_SINGLE("下拉单选","Pull single","2"),
     PULL_MORE("下拉多选","Pull more","3"),
     FILE("附件","File","4"),
-    TEXT_PULL_SINGLE("文本+下拉单选","Text+Pull single","5"),
-    TEXT_PULL_MORE("文本+下拉多选","Text+Pull more","6"),
+    TEXT_PULL_SINGLE("下拉单选+文本","Pull single+Text","5"),
+    TEXT_PULL_MORE("下拉多选+文本","Pull more+Text","6"),
     TEXT_FILE("文本+附件","Text+File","7"),
     PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"),
     PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"),
-    TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"),
+    TEXT_PULL_SINGLE_FILE("下拉单选+文本+附件","Pull single+Text+File","10"),
     Title("标题","Title","11");
 
     String name;

jero-web/src/common/lang/en-us.js

@@ -1080,12 +1080,12 @@ module.exports = {
   NDropdownradio: 'Pull single',
   NDropdownmultipleselection: 'Pull more',
   Nenclosure: 'File',
-  Atext: 'Text+Pull single',
-  Btext: 'Text+Pull more',
+  Atext: 'Pull single+Text',
+  Btext: 'Pull more+Text',
   Ctext: 'Text+File',
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
-  Ftext: 'Text+Pull single+File',
+  Ftext: 'Pull single+Text+File',
   Gtext: 'Title',
   Nnothing: 'Null',
   Nchinese: 'Chinese',

jero-web/src/common/lang/zh-cn.js

@@ -1091,12 +1091,12 @@ module.exports = {
   NDropdownradio: '下拉单选',
   NDropdownmultipleselection: '下拉多选',
   Nenclosure: '附件',
-  Atext: '文本+下拉单选',
-  Btext: '文本+下拉多选',
+  Atext: '下拉单选+文本',
+  Btext: '下拉多选+文本',
   Ctext: '文本+附件',
   Dtext: '下拉单选+附件',
   Etext: '下拉多选+附件',
-  Ftext: '文本+下拉单选+附件',
+  Ftext: '下拉单选+文本+附件',
   Gtext: '标题',
   Nnothing: '无',
   Nchinese: '中文',