diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 7ca70ca7..ed503de4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -542,16 +542,6 @@ public class PayCommonProjectController extends JeroController queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); - queryPayWorkingGroupDistributionRecord.eq(TbMemberProjectFile::getProjectId,id); - List 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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TbMemberProjectFile::getProjectId,tbMemberProjectSubitem.getProjectId()); + List fileList = tbMemberProjectFileService.list(queryWrapper); + String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(",")); + payCommonProject.setFiles(fileIds); + } String strProject = JSON.toJSONString(payCommonProject);