WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证清单，导入、导出、模板下载，认证类别字段顺序调整。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-18 14:55:08 +08:00
parent 45fe7481fa
commit c68a5e737e
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+5 -5
View File
@@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
private String configItem;
/**认证类型名称**/
@Excel(name = "认证类型", width = 20)
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -246,9 +251,4 @@ public class ProjectCertificationInventoryEO implements Serializable {
/**认证类型*/
@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
+6 -5
View File
@@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
private java.lang.String configItem;
/**认证类型*/
@Excel(name = "Certification Type", width = 20)
@ApiModelProperty(value = "认证类型")
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
@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
+8 -8
View File
@@ -3266,12 +3266,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else {
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
}
@@ -4505,12 +4505,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
try {
String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else {
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
}