认证清单,导入、导出、模板下载,认证类别字段顺序调整。
This commit is contained in:
+5
-5
@@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
|||||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||||
private String configItem;
|
private String configItem;
|
||||||
|
|
||||||
|
/**认证类型名称**/
|
||||||
|
@Excel(name = "认证类型", width = 20)
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String attestationTypeName;
|
||||||
|
|
||||||
/**WVTA ID*/
|
/**WVTA ID*/
|
||||||
@Excel(name = "WVTA ID", width = 20)
|
@Excel(name = "WVTA ID", width = 20)
|
||||||
@ApiModelProperty(value = "WVTA ID")
|
@ApiModelProperty(value = "WVTA ID")
|
||||||
@@ -246,9 +251,4 @@ public class ProjectCertificationInventoryEO implements Serializable {
|
|||||||
/**认证类型*/
|
/**认证类型*/
|
||||||
@ApiModelProperty(value = "认证类型")
|
@ApiModelProperty(value = "认证类型")
|
||||||
private String attestationType;
|
private String attestationType;
|
||||||
|
|
||||||
/**认证类型名称**/
|
|
||||||
@Excel(name = "认证类型", width = 20)
|
|
||||||
@TableField(exist = false)
|
|
||||||
private String attestationTypeName;
|
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-5
@@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
|
|||||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||||
private java.lang.String configItem;
|
private java.lang.String configItem;
|
||||||
|
|
||||||
|
/**认证类型*/
|
||||||
|
@Excel(name = "Certification Type", width = 20)
|
||||||
|
@ApiModelProperty(value = "认证类型")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String attestationTypeName;
|
||||||
|
|
||||||
/**WVTA ID*/
|
/**WVTA ID*/
|
||||||
@Excel(name = "WVTA ID", width = 20)
|
@Excel(name = "WVTA ID", width = 20)
|
||||||
@ApiModelProperty(value = "WVTA ID")
|
@ApiModelProperty(value = "WVTA ID")
|
||||||
@@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String endTimeStr;
|
private String endTimeStr;
|
||||||
|
|
||||||
/**认证类型*/
|
|
||||||
@Excel(name = "Certification Type", width = 20)
|
|
||||||
@ApiModelProperty(value = "认证类型")
|
|
||||||
@TableField(exist = false)
|
|
||||||
private String attestationTypeName;
|
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-8
@@ -3266,12 +3266,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
|
public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
|
||||||
String title = "";
|
String title = "";
|
||||||
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
|
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
|
||||||
title = "*类别,*检验项目,*配置项,*WVTA ID," +
|
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
|
||||||
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
|
"*标准编号,*责任领域,*工程接口人,*责任人," +
|
||||||
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
|
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
|
||||||
}else {
|
}else {
|
||||||
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
|
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
|
||||||
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
|
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
|
||||||
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
|
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4505,12 +4505,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
|
|||||||
try {
|
try {
|
||||||
String title = "";
|
String title = "";
|
||||||
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
|
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
|
||||||
title = "*类别,*检验项目,*配置项,*WVTA ID," +
|
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
|
||||||
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
|
"*标准编号,*责任领域,*工程接口人,*责任人," +
|
||||||
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
|
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
|
||||||
}else {
|
}else {
|
||||||
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
|
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
|
||||||
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
|
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
|
||||||
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
|
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user