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-17 13:32:44 +08:00
parent 7255f9d359
commit 5f83cb3342
3 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+7
View File
@@ -153,6 +153,11 @@ public class DummyInventoryInfoEO implements Serializable {
@Dict(dicCode ="attestation_rank") @Dict(dicCode ="attestation_rank")
private java.lang.String attestationRank; private java.lang.String attestationRank;
/**适用增补件*/
@ApiModelProperty(value = "适用增补件")
@Excel(name = "适用增补件", width = 15)
private java.lang.String applicableSupplement;
/**责任领域*/ /**责任领域*/
@Excel(name = "责任领域", width = 15,dicCode ="duty_territory") @Excel(name = "责任领域", width = 15,dicCode ="duty_territory")
@ApiModelProperty(value = "责任领域") @ApiModelProperty(value = "责任领域")
@@ -257,4 +262,6 @@ public class DummyInventoryInfoEO implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer pageSize; private Integer pageSize;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml
+1
View File
@@ -37,5 +37,6 @@
<result column="verify_initiator" property="verifyInitiator" /> <result column="verify_initiator" property="verifyInitiator" />
<result column="verify_duty" property="verifyDuty" /> <result column="verify_duty" property="verifyDuty" />
<result column="region" property="region" /> <result column="region" property="region" />
<result column="applicable_supplement" property="applicableSupplement" />
</resultMap> </resultMap>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+41 -40
View File
@@ -462,14 +462,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
titleOne = "*编号,子标题,实施类别," + titleOne = "*编号,子标题,实施类别," +
"WVTA ID,认证类型," + "WVTA ID,认证类型," +
"*认证级别," + "*认证级别," +"适用增补件,"+
"*责任领域,备注," + "*责任领域,备注," +
"设计符合性确认,Pre-homo确认,验证符合性确认"; "设计符合性确认,Pre-homo确认,验证符合性确认";
titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人"; titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
}else{ }else{
titleOne = "*serial number,subtitle,implementation category," + titleOne = "*serial number,subtitle,implementation category," +
"WVTA ID,certification type," + "WVTA ID,certification type," +
"*certification level," + "*certification level," +"applicable supplement,"+
"*area of responsibility,remarks," + "*area of responsibility,remarks," +
"design compliance check,pre-homo check,validation compliance chech"; "design compliance check,pre-homo check,validation compliance chech";
titleTwo = "type of deliverables,deliverable template,initiator,person liable," + titleTwo = "type of deliverables,deliverable template,initiator,person liable," +
@@ -513,7 +513,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
new CellRangeAddress(0, 1, i, i); new CellRangeAddress(0, 1, i, i);
sheet.addMergedRegion(region1); sheet.addMergedRegion(region1);
} }
for (int i = index; i < 11; i++) { for (int i = index; i < 12; i++) {
if(count > 1){ if(count > 1){
startLine = startLine + line + 1; startLine = startLine + line + 1;
endLine = startLine + line; endLine = startLine + line;
@@ -528,7 +528,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
count ++; count ++;
} }
CellRangeAddress region = CellRangeAddress region =
new CellRangeAddress(2, 2, 0, 19); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 new CellRangeAddress(2, 2, 0, 20); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
sheet.addMergedRegion(region); sheet.addMergedRegion(region);
String explain= ""; String explain= "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
@@ -571,7 +571,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//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(8+j).setCellValue(headerArrTwo[j]); row.createCell(9+j).setCellValue(headerArrTwo[j]);
} }
}else{ }else{
short height = (short) (7 * 252); short height = (short) (7 * 252);
@@ -604,7 +604,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
*/ */
private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) { private void treeDict(DummyInventoryInfoEO dummyInventoryInfoEO, List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
Set<String> technologyTerritorySet = new HashSet<>(); Set<String> technologyTerritorySet = new HashSet<>();
Set<String> correspondingStandardSet = new HashSet<>(); // Set<String> correspondingStandardSet = new HashSet<>();
List<String> deliverableList = new ArrayList<>(); List<String> deliverableList = new ArrayList<>();
if(dummyInventoryInfoEOList.size() != 0){ if(dummyInventoryInfoEOList.size() != 0){
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
@@ -614,10 +614,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
technologyTerritorySet.addAll(list); technologyTerritorySet.addAll(list);
} }
//对应标准 //对应标准
if(StringUtils.isNotBlank(record.getCorrespondingStandard())){ // if(StringUtils.isNotBlank(record.getCorrespondingStandard())){
List<String> list = Arrays.asList(record.getCorrespondingStandard().split(",")); // List<String> list = Arrays.asList(record.getCorrespondingStandard().split(","));
correspondingStandardSet.addAll(list); // correspondingStandardSet.addAll(list);
} // }
//设计符合性确认交付物模板 //设计符合性确认交付物模板
if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){ if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(",")));
@@ -632,13 +632,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
} }
} }
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = new ArrayList<>(); // List<BussDocumentLibraryEO> bussDocumentLibraryEOList = new ArrayList<>();
if(correspondingStandardSet.size() != 0){ // if(correspondingStandardSet.size() != 0){
//对应标准 iBussDocumentLibraryEOService // //对应标准 iBussDocumentLibraryEOService
LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<BussDocumentLibraryEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet); // wrapperTemp.in(BussDocumentLibraryEO::getId,correspondingStandardSet);
bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp); // bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapperTemp);
} // }
@@ -659,23 +659,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) {
//对应标准 //对应标准
if(bussDocumentLibraryEOList.size() != 0 && StringUtils.isNotBlank(record.getCorrespondingStandard())){ // if(bussDocumentLibraryEOList.size() != 0 && StringUtils.isNotBlank(record.getCorrespondingStandard())){
StringBuilder stringBuilder = new StringBuilder(); // StringBuilder stringBuilder = new StringBuilder();
for (String bussDocumentLibraryId : record.getCorrespondingStandard().split(",")) { // for (String bussDocumentLibraryId : record.getCorrespondingStandard().split(",")) {
List<BussDocumentLibraryEO> bussDocumentLibraryEOS = bussDocumentLibraryEOList.stream() // List<BussDocumentLibraryEO> bussDocumentLibraryEOS = bussDocumentLibraryEOList.stream()
.filter(e -> e.getId().equals(bussDocumentLibraryId)).collect(Collectors.toList()); // .filter(e -> e.getId().equals(bussDocumentLibraryId)).collect(Collectors.toList());
if(bussDocumentLibraryEOS.size() != 0){ // if(bussDocumentLibraryEOS.size() != 0){
stringBuilder.append(bussDocumentLibraryEOS.get(0).getSerialNumber()+","); // stringBuilder.append(bussDocumentLibraryEOS.get(0).getSerialNumber()+",");
}else{ // }else{
//手动输入的情况 // //手动输入的情况
stringBuilder.append(bussDocumentLibraryId + ","); // stringBuilder.append(bussDocumentLibraryId + ",");
} // }
} // }
if(StringUtils.isNotBlank(stringBuilder)){ // if(StringUtils.isNotBlank(stringBuilder)){
String substring = stringBuilder.substring(0, stringBuilder.length() - 1); // String substring = stringBuilder.substring(0, stringBuilder.length() - 1);
record.setCorrespondingStandardName(substring); // record.setCorrespondingStandardName(substring);
} // }
} // }
//技术领域 //技术领域
if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) { if (categoryList.size() != 0 && StringUtils.isNotBlank(record.getTechnologyTerritory())) {
List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(",")); List<String> technologyTerritoryList = Arrays.asList(record.getTechnologyTerritory().split(","));
@@ -743,7 +743,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public void importData(MultipartFile file, DummyInventoryInfoEO dummyInventoryInfoEO) { public void importData(MultipartFile file, DummyInventoryInfoEO dummyInventoryInfoEO) {
String title = ""; String title = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,*责任领域,备注," + title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," +
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,pre交付物类型,pre交付物模板,pre发起人,pre责任人,验证交付物类型,验证交付物模板,验证发起人,验证责任人"; "设计交付物类型,设计交付物模板,设计发起人,设计责任人,pre交付物类型,pre交付物模板,pre发起人,pre责任人,验证交付物类型,验证交付物模板,验证发起人,验证责任人";
}else{ }else{
@@ -862,21 +862,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
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 == 7){ if(j == 8){
break; break;
} }
}else if(i == 1){ }else if(i == 1){
if(j > 7){ if(j > 8){
String flag = ""; String flag = "";
if(7 < j && j < 12){ if(8 < j && j < 13){
flag ="设计"; flag ="设计";
key = flag + headerCell.getStringCellValue(); key = flag + headerCell.getStringCellValue();
} }
if(11 < j && j < 16){ if(12 < j && j < 17){
flag ="pre"; flag ="pre";
key = flag + headerCell.getStringCellValue(); key = flag + headerCell.getStringCellValue();
} }
if(15 < j && j < 20){ if(16 < j && j < 21){
flag ="验证"; flag ="验证";
key = flag + headerCell.getStringCellValue(); key = flag + headerCell.getStringCellValue();
@@ -1420,6 +1420,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
case "WVTA ID": return "wvtaId"; case "WVTA ID": return "wvtaId";
case "认证类型": return "attestationType"; case "认证类型": return "attestationType";
case "*认证级别": return "attestationRank"; case "*认证级别": return "attestationRank";
case "适用增补件": return "applicableSupplement";
case "技术领域": return "technologyTerritory"; case "技术领域": return "technologyTerritory";
case "*责任领域": return "dutyTerritory"; case "*责任领域": return "dutyTerritory";
case "适用地区": return "region"; case "适用地区": return "region";