市场法规清单，增加认证类型字段，新增、编辑、导入、导出、模板下载修改。

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -619,4 +619,6 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip
 INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033251040337922', '1646032917672861697', '地标', 'dfbc363b6e2d4d9c97664aeb6731767e', NULL, 3, 1, 'admin', '2023-04-12 14:11:24', NULL, NULL, 1, NULL, NULL, '0', 'Landmark');
 INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033351942709250', '1646032917672861697', '其他', '17a3731e5a374d8ba3909cca2464a8eb', NULL, 4, 1, 'admin', '2023-04-12 14:11:48', NULL, NULL, 1, NULL, NULL, '0', 'Other');
 
-
+-- 市场认证清单 增加字段  2023-04-17  未同步生产环境
+ALTER TABLE `auth_dummy_inventory_info`
+    ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `deliverable_template`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java

@@ -77,6 +77,11 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     @ApiModelProperty(value = "配置项")
     private java.lang.String configItem;
 
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")
@@ -149,4 +154,8 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     // 1顺序  2倒序
     @TableField(exist = false)
     private String orderBy;
+
+    /**认证类型*/
+    @ApiModelProperty(value = "认证类型")
+    private String attestationType;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java

@@ -74,6 +74,12 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
     @ApiModelProperty(value = "配置项")
     private String configItem;
 
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 15)
     @ApiModelProperty(value = "WVTA ID")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -957,9 +957,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		if(CollectionUtils.isNotEmpty(baseList)){
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,交付物模板,*交付物类型";
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID,*编号,*责任领域,*交付物类型,交付物模板";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID,*Number,*Responsible Field,Deliverable Template,*Deliverable Type";
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID,*Number,*Responsible Field,*Deliverable Type,Deliverable Template";
 			}
 
 			int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1077,7 +1077,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 									if (i == 0) {
 										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 										headerSb.append(cell.getStringCellValue() + ",");
-										if(j == 7){
+										if(j == 8){
 											break;
 										}
 									} else if(i > 1){
@@ -1293,6 +1293,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			//编号必填
 			flag = must(authDummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
 
+			// 认证类型
+			String attestationTypeName = authDummyInventoryInfoEO.getAttestationTypeName();
+
+
 
 			//类别
 			if(StringUtils.isNotBlank(category)){
@@ -1361,6 +1365,12 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					authDummyInventoryInfoEO.setDeliverableType(treeId);
 				}
 			}
+			if (StringUtils.isNotEmpty(attestationTypeName)) {
+				value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, attestationTypeName,msgList,"认证类型","Certification Type","ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+				if(StringUtils.isNotBlank(value)){
+					authDummyInventoryInfoEO.setAttestationType(value);
+				}
+			}
 		}
 		return msgList;
 	}
@@ -1683,6 +1693,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*类别": return "category";
 			case "*检验项目": return "inspectionItem";
 			case "*配置项": return "configItem";
+			case "*认证类型": return "attestationTypeName";
 			case "*WVTA ID": return "wvtaId";
 			case "*编号" : return "serialNumber";
 			case "*责任领域": return "dutyTerritoryName";
@@ -1692,6 +1703,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			case "*Category" : return  "Category";
 			case "*Inspection Items" : return"inspectionItem";
 			case "*Configuration Item" : return"configItem";
+			case "*Certification Type": return "attestationTypeName";
 //			case "WVTA ID" : return "wvtaId";
 			case "*Number" : return "serialNumber";
 			case "*Responsible Field" : return "dutyTerritoryName";
@@ -1778,10 +1790,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID," +
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
 						"*编号,*责任领域,*交付物类型,交付物模板,";
 			}else{
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
 						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
@@ -1896,6 +1908,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 					}).map(OSSFile::getFileName).collect(Collectors.joining(","));
 					data.setDeliverableTemplateName(deliverableTemplateName);
 				}
+				if(StringUtils.isNotEmpty(data.getAttestationType())){
+					String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+					data.setAttestationTypeName(attestationTypeName);
+				}
 			}
 
 		}