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

67170 法规清单下载模板修改。导入功能修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-27 13:22:12 +08:00
parent 93141a12e9
commit 9f2f853ab7
1 changed files with 31 additions and 35 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/service/impl/ProjectLawsInventoryEOServiceImpl.java
+31 -35
View File
@@ -4964,23 +4964,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String titleOne = ""; String titleOne = "";
String titleTwo = ""; String titleTwo = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
titleOne = "*编号,子标题,WVTA ID," + titleOne = "*编号,标题,子标题," +
"实施类别,认证类型,*认证级别,适用增补件," + "认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," + "*责任领域,法规工程师,工程接口人," +
"备注," + "备注," +
"设计符合性确认,Pre-homo确认,验证符合性确认"; "设计符合性确认,验证符合性确认";
titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," + titleTwo = "交付物类型,交付物模板,责任人,截止时间,交付物说明," +
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," + "交付物类型,交付物模板,责任人,截止时间,交付物说明";
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明";
}else{ }else{
titleOne = "*Number,Sub-Title,WVTA ID," + titleOne = "*Number,Title,Sub-Title," +
"Usage,Certification Type,*Certification Level,Applicable Supplement," + "Certification Type,*Certification Level,Applicable Supplement," +
"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," + "*Responsible Field,Regulation Engineer,Engineering Interface," +
"Comments," + "Comments," +
"Design Compliance Check,Pre-homo Check,Validation Compliance Check"; "Design Compliance Check,Validation Compliance Check";
titleTwo = "Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description," + titleTwo = "Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description," +
"Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description," + "Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description";
"Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description";
} }
List<String> list = Arrays.asList(titleOne.split(",")); List<String> list = Arrays.asList(titleOne.split(","));
@@ -5011,7 +5009,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
int count = 1; int count = 1;
int startLine = 0; int startLine = 0;
int endLine = 0; int endLine = 0;
int line = 5; int line = 4;
for (int i = 0; i < index; i++) { for (int i = 0; i < index; i++) {
//合并单元格 //合并单元格
CellRangeAddress region1 = CellRangeAddress region1 =
@@ -5068,7 +5066,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
row.createCell(lineTemp).setCellValue(headerArr[m]); row.createCell(lineTemp).setCellValue(headerArr[m]);
Cell cell = row.getCell(lineTemp); Cell cell = row.getCell(lineTemp);
cell.setCellStyle(cellStyle); cell.setCellStyle(cellStyle);
lineTemp = lineTemp + 6; lineTemp = lineTemp + 5;
} }
} }
@@ -5076,7 +5074,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//titleTwo //titleTwo
String[] headerArrTwo = titleTwo.split(","); String[] headerArrTwo = titleTwo.split(",");
for (int j = 0; j < headerArrTwo.length; j++) { for (int j = 0; j < headerArrTwo.length; j++) {
row.createCell(12+j).setCellValue(headerArrTwo[j]); row.createCell(10+j).setCellValue(headerArrTwo[j]);
} }
}else{ }else{
short height = (short) (7 * 252); short height = (short) (7 * 252);
@@ -5604,21 +5602,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
}else{ }else{
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
title = "*编号,子标题,WVTA ID," + title = "*编号,标题,子标题," +
"实施类别,认证类型,*认证级别,适用增补件," + "认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," + "*责任领域,法规工程师,工程接口人," +
"备注," + "备注," +
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," + "设计交付物类型,设计交付物模板,设计责任人,设计截止时间,设计交付物说明," +
"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," + "验证交付物类型,验证交付物模板,验证责任人,验证截止时间,验证交付物说明";
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
}else{ }else{
title = "*Number,Sub-Title,WVTA ID," + title = "*Number,Title,Sub-Title," +
"Usage,Certification Type,*Certification Level,Applicable Supplement," + "Certification Type,*Certification Level,Applicable Supplement," +
"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," + "*Responsible Field,Regulation Engineer,Engineering Interface," +
"Comments," + "Comments," +
"design Deliverable Type,design Deliverable Template,design Reviewer,design Assignee,design Due Date,design Deliverable Description," + "design Deliverable Type,design Deliverable Template,design Assignee,design Due Date,design Deliverable Description," +
"pre Deliverable Type,pre Deliverable Template,pre Reviewer,pre Assignee,pre Due Date,pre Deliverable Description," + "verify Deliverable Type,verify Deliverable Template,verify Assignee,verify Due Date,verify Deliverable Description";
"verify Deliverable Type,verify Deliverable Template,verify Reviewer,verify Assignee,verify Due Date,verify Deliverable Description";
} }
//导入的数据为填写模板的数据 //导入的数据为填写模板的数据
for (int i = 0; i <= rowNos; i++) { for (int i = 0; i <= rowNos; i++) {
@@ -5636,13 +5632,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (i == 0) { if (i == 0) {
cell.setCellType(HSSFCell.CELL_TYPE_STRING); cell.setCellType(HSSFCell.CELL_TYPE_STRING);
headerSb.append(cell.getStringCellValue() + ","); headerSb.append(cell.getStringCellValue() + ",");
if(j == 11){ if(j == 9){
break; break;
} }
}else if(i == 1){ }else if(i == 1){
if(j > 11){ if(j > 9){
String flag = ""; String flag = "";
if(11 < j && j < 18){ if(9 < j && j < 15){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="设计"; flag ="设计";
}else{ }else{
@@ -5650,15 +5646,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
key = flag + headerCell.getStringCellValue(); key = flag + headerCell.getStringCellValue();
} }
if(17 < j && j < 24){ /*if(17 < j && j < 24){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="pre"; flag ="pre";
}else{ }else{
flag ="pre "; flag ="pre ";
} }
key = flag + headerCell.getStringCellValue(); key = flag + headerCell.getStringCellValue();
} }*/
if(23 < j && j < 30){ if(14 < j && j < 20){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="验证"; flag ="验证";
}else{ }else{