fix(资料中心): 79957
This commit is contained in:
+20
-16
@@ -161,20 +161,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
|
|||||||
.notIn(OSSFile::getId, meetingDataList));
|
.notIn(OSSFile::getId, meetingDataList));
|
||||||
|
|
||||||
// 同步文件到资料中心
|
// 同步文件到资料中心
|
||||||
for (String meetingData : meetingDataList) {
|
toDataCentre(lawsStandardization, loginUser, standardizationMeeting, meetingDataList);
|
||||||
LawsDataCenterFile lawsDataCenterFile = new LawsDataCenterFile();
|
|
||||||
lawsDataCenterFile.setFileId(meetingData);
|
|
||||||
// XXX(分标委名称)- XXXX(工作组名称)-会议资料
|
|
||||||
lawsDataCenterFile.setFileDescription(getFileDescription(lawsStandardization));
|
|
||||||
lawsDataCenterFile.setCreateBy(standardizationMeeting.getCreateBy());
|
|
||||||
List<SysDepart> sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy());
|
|
||||||
SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy());
|
|
||||||
List<String> 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);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// 删除旧文件
|
// 删除旧文件
|
||||||
ossFileService.remove(new LambdaQueryWrapper<OSSFile>()
|
ossFileService.remove(new LambdaQueryWrapper<OSSFile>()
|
||||||
@@ -186,7 +173,24 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
|
|||||||
lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
|
lawsStandardizationMeetingService.saveOrUpdateBatch(standardizationMeetingList);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getFileDescription(LawsStandardization lawsStandardization) {
|
private void toDataCentre(LawsStandardization lawsStandardization, LoginUser loginUser, LawsStandardizationMeeting standardizationMeeting, List<String> 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<SysDepart> sysDeparts = sysDepartService.queryDepartsByUsername(standardizationMeeting.getCreateBy());
|
||||||
|
SysUser sysUser = sysUserService.getUserByName(standardizationMeeting.getCreateBy());
|
||||||
|
List<String> 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();
|
LawsStandardization treeList = queryTreeList();
|
||||||
// 拆开为list结构
|
// 拆开为list结构
|
||||||
@@ -212,7 +216,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
|
|||||||
if (stringBuilder.length() > 0){
|
if (stringBuilder.length() > 0){
|
||||||
stringBuilder.append("-");
|
stringBuilder.append("-");
|
||||||
}
|
}
|
||||||
return stringBuilder.append("会议资料").toString();
|
return stringBuilder.append(name).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getNodeName(LawsStandardization lawsStandardization, List<LawsStandardization> list, StringBuilder stringBuilder) {
|
private void getNodeName(LawsStandardization lawsStandardization, List<LawsStandardization> list, StringBuilder stringBuilder) {
|
||||||
|
|||||||
Reference in New Issue
Block a user