diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index 22ecd316..448f2ae8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -161,20 +161,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy()); - SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy()); - List orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList()); - lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId()); - lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo()); - lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList)); - lawsDataCenterFileService.add(lawsDataCenterFile); - } + toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList); } else { // 删除旧文件 ossFileService.remove(new LambdaQueryWrapper() @@ -186,7 +173,24 @@ public class LawsStandardizationServiceImpl extends ServiceImpl meetingDataList) { + for (String meetingData : meetingDataList) { + LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile(); + lawsDataCenterFile.setFileId(meetingData); + // XXX(分标委名称)- XXXX(工作组名称)-会议资料 + lawsDataCenterFile.setFileDescription(getFileDescription(lawsStandardization, standardizationMeeting.getName())); + lawsDataCenterFile.setCreateBy(standardizationMeeting.getCreateBy()); + List sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy()); + SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy()); + List orgCodeList = sysDeparts.stream().map(SysDepart::getOrgCode).collect(Collectors.toList()); + lawsDataCenterFile.setOwnerId(Objects.isNull(sysUser) ? loginUser.getId() : sysUser.getId()); + lawsDataCenterFile.setUploader(Objects.isNull(sysUser) ? loginUser.calcNameWorkNo() : sysUser.calcNameWorkNo()); + lawsDataCenterFile.setOrgCode(String.join(",", orgCodeList)); + lawsDataCenterFileService.add(lawsDataCenterFile); + } + } + + private String getFileDescription(LawsStandardization lawsStandardization, String name) { // 树形结构 LawsStandardization treeList = queryTreeList(); // 拆开为list结构 @@ -212,7 +216,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl 0){ stringBuilder.append("-"); } - return stringBuilder.append("会议资料").toString(); + return stringBuilder.append(name).toString(); } private void getNodeName(LawsStandardization lawsStandardization, List list, StringBuilder stringBuilder) {