diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 31f23a177..8878e44fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -4555,11 +4555,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ title = "*类别,*检验项目,*认证类型,*WVTA ID," + "*标准编号,*责任领域,*工程接口人,*责任人," + - "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; + "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注"; }else { 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"; + "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark"; } int pos = file.getOriginalFilename().lastIndexOf("."); @@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if (i == 0) { cell.setCellType(HSSFCell.CELL_TYPE_STRING); headerSb.append(cell.getStringCellValue() + ","); - if(j == 14){ + if(j == 15){ break; } } else if(i > 1){ @@ -5823,6 +5823,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI case "产品型号": return "productModel"; case "生产企业名称": return "productionEnterpriseName"; case "认证进度": return "certificationProgress"; + case "备注": return "remark"; case "*Category": return "category"; case "*Inspection Items": return "inspectionItem"; @@ -5842,6 +5843,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI case "Product Model": return "productModel"; case "Name Of Manufacturer": return "productionEnterpriseName"; case "Homologation Progress": return "certificationProgress"; + case "Remark": return "remark"; default: return null; //"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," + @@ -5866,19 +5868,19 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ title = "*类别,*检验项目,*认证类型,*WVTA ID," + "*标准编号,*责任领域,*工程接口人,*责任人," + - "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; + "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称,备注"; }else { 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"; + "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer,Remark"; } List list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - index = list.indexOf("生产企业名称") + 1; + index = list.indexOf("备注") + 1; }else{ - index = list.indexOf("Name Of Manufacturer") + 1; + index = list.indexOf("Remark") + 1; } //创建临时文件夹 @@ -5902,7 +5904,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI cellStyleTemp.setWrapText(true);//自动换行 CellRangeAddress region = - new CellRangeAddress(1, 1, 0, 13); //参数1:起始行 参数2:终止行 参数3:起始列 参数4:终止列 + new CellRangeAddress(1, 1, 0, 14); //参数1:起始行 参数2:终止行 参数3:起始列 参数4:终止列 sheet.addMergedRegion(region); String explain= ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ @@ -6071,8 +6073,10 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI String projectLibraryId = pciList.get(0).getProjectLibraryId(); ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId); if(ObjectUtils.isNotEmpty(projectLibraryBase)){ - List studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); - + List studioEngineerUserInfo = new ArrayList<>(); + if(StringUtils.isNotBlank(projectLibraryBase.getStudioEngineer())){ + studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(","))); + } String certificationEngineerUserNames = ""; if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ List certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));