LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 83132 在会员企业端--项目详情页面-没有回显其他分发资料

Browse Source
This commit is contained in:
lijiarao
2024-03-28 10:37:52 +08:00
parent 7030529055
commit e45caffac5
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+6 -10
View File
@@ -542,16 +542,6 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
// 标协会员项目
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5)){
LambdaQueryWrapper<TbMemberProjectFile> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(TbMemberProjectFile::getProjectId,id);
List<TbMemberProjectFile> fileList = tbMemberProjectFileService.list(queryPayWorkingGroupDistributionRecord);
String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(","));
payCommonProject.setFiles(fileIds);
//payCommonProject.setChargeStandard(memberProject.getChargeStandard());
//payCommonProject.setChargeNoticeFileId(memberProject.getChargeNoticeFileId());
//payCommonProject.setCouncilChargeStandard(memberProject.getCouncilChargeStandard());
//payCommonProject.setCouncilChargeNoticeNo(memberProject.getCouncilChargeNoticeNo());
//payCommonProject.setCouncilChargeNoticeFileId(memberProject.getCouncilChargeNoticeFileId());
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemService.queryById(id);
payCommonProject.setMemberNo(tbMemberProjectSubitem.getMemberNo());
payCommonProject.setMemberNature(tbMemberProjectSubitem.getMemberNature());
@@ -561,6 +551,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
payCommonProject.setRemarks(tbMemberProjectSubitem.getRemark());
payCommonProject.setChargeNoticeId(tbMemberProjectSubitem.getChargeNoticeId());
LambdaQueryWrapper<TbMemberProjectFile> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbMemberProjectFile::getProjectId,tbMemberProjectSubitem.getProjectId());
List<TbMemberProjectFile> fileList = tbMemberProjectFileService.list(queryWrapper);
String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(","));
payCommonProject.setFiles(fileIds);
}
String strProject = JSON.toJSONString(payCommonProject);