认证清单-增加认证类型

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

@@ -609,5 +609,14 @@ where  id in (
 ALTER TABLE `project_certification_inventory`
     ADD COLUMN `inventory_verify_end_time` datetime(0) NULL COMMENT '清单校核截止时间' AFTER `project_library_id`,
     ADD COLUMN `task_confirm_end_time` datetime(0) NULL COMMENT '责任确认截止时间' AFTER `inventory_verify_end_time`;
+-- 认证清单，增加字段   2023-04-17  未同步生产环境
+ALTER TABLE `project_certification_inventory`
+    ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `task_confirm_end_time`;
+-- 数据字典 增加 认证清单-认证类别   2023-04-17  未同步生产环境
+INSERT INTO `sys_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1646032917672861697', '认证清单-认证类型', 'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2', NULL, 0, 'admin', '2023-04-12 14:10:04', NULL, NULL, NULL, NULL, 1, 0, '1', 1);
+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 ('1646033124468826113', '1646032917672861697', '公告', '12d45870339f47d59b95f0e9baabe404', NULL, 1, 1, 'admin', '2023-04-12 14:10:53', NULL, NULL, 1, NULL, NULL, '0', 'Announcement');
+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 ('1646033156706246657', '1646032917672861697', 'CCC', '6c7c21ec0dd24cdd87e10c4c40208a78', NULL, 2, 1, 'admin', '2023-04-12 14:11:01', NULL, NULL, 1, NULL, NULL, '0', 'CCC');
+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');
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java

@@ -242,4 +242,13 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "责任确认截止时间")
     private Date taskConfirmEndTime;
+
+    /**认证类型*/
+    @ApiModelProperty(value = "认证类型")
+    private String attestationType;
+
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java

@@ -218,4 +218,10 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     //    @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
     @TableField(exist = false)
     private String endTimeStr;
+
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -996,6 +996,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 //					}
 //					data.setEndTimeStr(String.valueOf(endTime));
 //				}
+				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);
+				}
 			}
 		}
 	}
@@ -3259,11 +3263,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 			title = "*类别,*检验项目,*配置项,*WVTA ID," +
-					"*标准编号,*责任领域,*工程接口人,*责任人," +
+					"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
 					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
 			title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
+					"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
 					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
 
@@ -3616,6 +3620,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//交付物模板
 			String deliverableTemplate = projectCertificationInventoryEO.getDeliverableTemplateName();
 
+			// 认证类型
+			String attestationTypeName = projectCertificationInventoryEO.getAttestationTypeName();
+
 
 
 
@@ -3776,6 +3783,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			}
 
+			if (StringUtils.isNotEmpty(attestationTypeName)) {
+				value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, attestationTypeName,msgList,"认证类型","Certification Type","ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
+				if(StringUtils.isNotBlank(value)){
+					projectCertificationInventoryEO.setAttestationType(value);
+				}
+			}
+
 		}
 		return msgList;
 	}
@@ -4433,6 +4447,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			case "*WVTA ID": return "wvtaId";
 			case "*标准编号": return "serialNumber";
 			case "*责任领域": return "dutyTerritoryName";
+			case "*认证类型": return "attestationTypeName";
 			case "*工程接口人": return "sdtName";
 			case "*责任人": return "dutyPersonName";
 			case "*交付物类型": return "deliverableTypeName";
@@ -4451,6 +4466,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			case "*Configuration Item": return "configItem";
 			case "*Standard No": return "serialNumber";
 			case "*Responsible Field": return "dutyTerritoryName";
+			case "*Certification Type": return "attestationTypeName";
 			case "*Eng. Interface": return "sdtName";
 			case "*Assignee": return "dutyPersonName";
 			case "*Deliverable Type": return "deliverableTypeNameEn";
@@ -4486,11 +4502,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			String title = "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*标准编号,*责任领域,*工程接口人,*责任人," +
+						"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
 						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
+						"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
 						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}