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

法规清单--添加使用增补件和交付物模板说明

Browse Source 
英文切换
This commit is contained in:
zhn
2022-05-18 16:28:05 +08:00
parent b30dc1636a
commit f4dec0c456
3 changed files with 95 additions and 70 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/ProjectLawsInventoryEO.java
+17 -8
View File
@@ -141,6 +141,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@Dict(dicCode ="attestation_rank")
private String attestationRank;
//适用增补件
@Excel(name = "适用增补件", width = 20)
private String applicableSupplement;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -236,6 +240,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String designDueDateString;
//交付物说明
@Excel(name = "设计符合性确认-交付物说明", width = 20)
private String designRemark;
/**prehomo确认-交付物类型*/
@Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-1")
@@ -288,6 +296,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String prehomoDueDateString;
//prehomo确认-交付物说明
@Excel(name = "prehomo确认-交付物说明", width = 20)
private String prehomoRemark;
/**验证符合性确认-交付物类型*/
@Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@@ -340,6 +352,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String verifyDueDateString;
//验证备注
@Excel(name = "验证符合性确认-交付物说明", width = 20)
private String verifyRemark;
@TableField(exist = false)
@ApiModelProperty(value = "角色代码")
private String roleCode;//角色代码
@@ -395,12 +411,5 @@ public class ProjectLawsInventoryEO implements Serializable {
@ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
private String flag;
//适用增补件
private String applicableSupplement;
//验证备注
private String verifyRemark;
//pre备注
private String prehomoRemark;
//设计备注
private String designRemark;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+69 -53
View File
@@ -1593,20 +1593,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String titleTwo = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
titleOne = "*编号,子标题,WVTA ID," +
"实施类别,认证类型,*认证级别," +
"实施类别,认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," +
"备注," +
"设计符合性确认,Pre-homo确认,验证符合性确认";
titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物类型,交付物模板,发起人,责任人,截止时间,交付物类型,交付物模板,发起人,责任人,截止时间,";
titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明";
}else{
titleOne = "*serial number,subtitle,WVTA ID," +
"*implementation category,certification type,*certification level," +
"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
"remarks," +
titleOne = "*Number,Sub-Title,WVTA ID," +
"Usage,Certification Type,*Certification Level,Applicable Supplements," +
"*Responsible Field,laws engineer,authentication engineer,engineering interface person," +
"Comments," +
"design compliance check,pre-homo check,validation compliance chech";
titleTwo = "type of deliverables,deliverable template,initiator,person liable,deadline," +
"type of deliverables,deliverable template,initiator,person liable,deadline," +
"type of deliverables,deliverable template,initiator,person liable,deadline";
titleTwo = "type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description," +
"type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description," +
"type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description";
}
List<String> list = Arrays.asList(titleOne.split(","));
@@ -1614,7 +1616,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
index = list.indexOf("备注") + 1;
}else{
index = list.indexOf("remarks") + 1;
index = list.indexOf("Comments") + 1;
}
//创建临时文件夹
@@ -1637,14 +1639,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
int count = 1;
int startLine = 0;
int endLine = 0;
int line = 4;
int line = 5;
for (int i = 0; i < index; i++) {
//合并单元格
CellRangeAddress region1 =
new CellRangeAddress(0, 1, i, i);
sheet.addMergedRegion(region1);
}
for (int i = index; i < 15; i++) {
for (int i = index; i < 16; i++) {
if(count > 1){
startLine = startLine + line + 1;
endLine = startLine + line;
@@ -1659,7 +1661,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
count ++;
}
CellRangeAddress region =
new CellRangeAddress(2, 2, 0, 25); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
new CellRangeAddress(2, 2, 0, 29); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
sheet.addMergedRegion(region);
String explain= "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -1671,13 +1673,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
}else{
explain = "filling explanation\n" +
"1.import data starts at the fourth line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"6.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. diocx is stored under the AAA standard number, enter AAA/B. diocx";
explain = "Filling explanation\n" +
"1.Import data starts at the fourth line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Certification type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.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. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
@@ -1694,7 +1696,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
row.createCell(lineTemp).setCellValue(headerArr[m]);
Cell cell = row.getCell(lineTemp);
cell.setCellStyle(cellStyle);
lineTemp = lineTemp + 5;
lineTemp = lineTemp + 6;
}
}
@@ -1702,7 +1704,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//titleTwo
String[] headerArrTwo = titleTwo.split(",");
for (int j = 0; j < headerArrTwo.length; j++) {
row.createCell(11+j).setCellValue(headerArrTwo[j]);
row.createCell(12+j).setCellValue(headerArrTwo[j]);
}
}else{
short height = (short) (7 * 252);
@@ -1797,20 +1799,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String title = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
title = "*编号,子标题,WVTA ID," +
"实施类别,认证类型,*认证级别," +
"实施类别,认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," +
"备注," +
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间," +
"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间," +
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间";
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
}else{
title = "*serial number,subtitle,WVTA ID," +
"*implementation category,certification type,*certification level," +
"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
"remarks," +
"design type of deliverables,design deliverable template,design initiator,design person liable,design deadline," +
"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline," +
"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline";
title = "*Number,Sub-Title,WVTA ID," +
"Usage,Certification Type,*Certification Level,Applicable Supplements," +
"*Responsible Field,laws engineer,authentication engineer,engineering interface person," +
"Comments," +
"design type of deliverables,design deliverable template,design initiator,design person liable,design deadline,design Deliverables Description," +
"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline,pre Deliverables Description," +
"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline,verify Deliverables Description";
}
int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1926,13 +1928,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (i == 0) {
cell.setCellType(HSSFCell.CELL_TYPE_STRING);
headerSb.append(cell.getStringCellValue() + ",");
if(j == 10){
if(j == 11){
break;
}
}else if(i == 1){
if(j > 10){
if(j > 11){
String flag = "";
if(10 < j && j < 16){
if(11 < j && j < 18){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="设计";
}else{
@@ -1940,7 +1942,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
key = flag + headerCell.getStringCellValue();
}
if(15 < j && j < 21){
if(17 < j && j < 24){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="pre";
}else{
@@ -1948,7 +1950,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
key = flag + headerCell.getStringCellValue();
}
if(20 < j && j < 26){
if(23 < j && j < 30){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="验证";
}else{
@@ -2150,7 +2152,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
//编号(输入框必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "serial number");
flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "Number");
//子标题
if(StringUtils.isNotBlank(subtitle)){
@@ -2190,29 +2192,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//实施类别(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","Usage","implement_type");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setImplementType(value);
}
//认证类型(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","Certification Type","attestation_type");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setAttestationType(value);
}
//认证级别(单选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","certification level");
flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
if(flag){
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank,msgList,"认证级别","certification level","attestation_rank");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank,msgList,"认证级别","Certification Level","attestation_rank");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setAttestationRank(value);
}
}
//责任领域(多选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","area of responsibility");
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
if(flag){
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","area of responsibility","duty_territory");
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setDutyTerritory(value);
}
@@ -2488,7 +2490,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
}else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the area of responsibility in the relevant person list";
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
}
msgList.add(errorMsg);
}
@@ -2496,7 +2498,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
}else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the area of responsibility in the relevant person list";
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
}
msgList.add(errorMsg);
}
@@ -2635,25 +2637,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (field == null) return null;
switch (field) {
case "*编号": return "serialNumber";
case "*serial number": return "serialNumber";
case "*Number": return "serialNumber";
case "标题": return "title";
case "子标题": return "subtitle";
case "subtitle": return "subtitle";
case "Sub-Title": return "subtitle";
case "适用范围": return "shi4Yong4Fan4Wei2";
case "状态": return "state";
case "对应标准": return "correspondingStandard";
case "实施类别": return "implementType";
case "*implementation category": return "implementType";
case "Usage": return "implementType";
case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "在产车实施日期": return "implementTime";
case "WVTA ID": return "wvtaId";
case "认证类型": return "attestationType";
case "certification type": return "attestationType";
case "Certification Type": return "attestationType";
case "*认证级别": return "attestationRank";
case "*certification level": return "attestationRank";
case "*Certification Level": return "attestationRank";
case "适用增补件": return "applicableSupplement";
case "Applicable Supplements": return "applicableSupplement";
case "技术领域": return "technologyTerritory";
case "*责任领域": return "dutyTerritory";
case "*area of responsibility": return "dutyTerritory";
case "*Responsible Field": return "dutyTerritory";
case "适用地区": return "region";
case "备注": return "remark";
case "remark": return "remark";
@@ -2673,6 +2677,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "design person liable": return "designDutyId";
case "设计截止时间": return "designDueDate";
case "design deadline": return "designDueDate";
case "设计交付物说明": return "designRemark";
case "design Deliverables Description": return "designRemark";
case "pre交付物类型": return "prehomoDeliverableType";
case "pre type of deliverables": return "prehomoDeliverableType";
case "pre交付物模板": return "prehomoDeliverableTemplate";
@@ -2683,6 +2691,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "pre person liable": return "prehomoDutyId";
case "pre截止时间": return "prehomoDueDate";
case "pre deadline": return "prehomoDueDate";
case "pre交付物说明": return "prehomoRemark";
case "pre Deliverables Description": return "prehomoRemark";
case "验证交付物类型": return "verifyDeliverableType";
case "verify type of deliverables": return "verifyDeliverableType";
case "验证交付物模板": return "verifyDeliverableTemplate";
@@ -2693,6 +2705,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "verify person liable": return "verifyDutyId";
case "验证截止时间": return "verifyDueDate";
case "verify deadline": return "verifyDueDate";
case "验证交付物说明": return "verifyRemark";
case "verify Deliverables Description": return "verifyRemark";
default: return null;
//"type of deliverables,deliverable template,initiator,person liable,deadline," +
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+9 -9
View File
@@ -507,9 +507,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.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. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
HSSFRichTextString explain=new HSSFRichTextString(explainInfo);
@@ -617,9 +617,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n" +
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.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. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
@@ -683,9 +683,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.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. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
List<String> titleOneList = Arrays.asList(titleOne.split(","));