Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

This commit is contained in:
zyx.net
2023-09-27 09:45:05 +08:00
@@ -5816,11 +5816,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
try {
String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
title = "*类别,*检验项目,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else {
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
}
@@ -5862,14 +5862,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
"1.导入数据从第三行开始\n" +
"2.所有带*号的字段必须填写\n"+
"3.责任人,交付物类型,工程接口人,编号,责任领域,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"4.类别,WVTA ID,检验项目,配置项,填写文本内容\n" +
"4.类别,WVTA ID,检验项目,填写文本内容\n" +
"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
}else{
explain = "Filling explanation\n" +
"1.Import data starts at the third line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Assignee,Deliverable Type,Eng. Interface,Standard No,Responsible Field,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Category,WVTA ID,Configuration Item,Inspection Items,Fill in the text\n" +
"4.Category,WVTA ID,Configuration Item,Fill in the text\n" +
"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. docx is stored under the AAA standard number, enter AAA/B. docx";
}
for(int i = 0; i < 2; i++){