diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7dce50de2..e41696c0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3931,6 +3931,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl #a# # + String references_col = record1.get("references_col").toString(); + String[] references_colArr = references_col.split("#"); + if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) + ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ + String fileId = references_colArr[2]; + List fileInfos = this.ossFileService.getFileInfos(fileId); + String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; + } + + StringBuilder references_colSb = new StringBuilder(); + for (String col : references_col.split("#")) { + if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){ + references_colSb.append(col).append("#"); + } + } + + if(StringUtils.isNotEmpty(references_colSb)){ + references_col = references_colSb.substring(0,references_colSb.length()-1); + }else { + references_col = references_colSb.toString(); + } + + record1.put("references_col",references_col); + // 处理负责领域 record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java index 496b90f3f..cffeeb7a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java @@ -48,7 +48,9 @@ public class ProjectUserPermissionController extends JeroController implements IProjectUserPermissionService { @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 4f07c88f9..ae1d10b2e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1304,11 +1304,11 @@ public class WordUtil { return text; } if (text.equals("New Car Model")) { - text = "New Type "; + text = "New Type"; return text; } if (text.equals("Models In Production")) { - text = "New Vehicle "; + text = "New Vehicle"; return text; } return text; @@ -1348,7 +1348,7 @@ public class WordUtil { blank = "\r\n"; break; case "New Car Model": - blank = " "; + blank = " "; break; case "Models In Production": blank = ""; @@ -1366,7 +1366,7 @@ public class WordUtil { blank = " "; break; case "Public Notice": - blank = " "; + blank = " "; break; case "Release": blank = ""; @@ -1389,6 +1389,9 @@ public class WordUtil { case "if fitted": blank = ""; break; + case "Publicity": + blank = " "; + break; default: break; }