diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 57a067a2..58fcfb5f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -666,5 +666,75 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); + wrapper.eq(PayCaseCommitteeSubitem::getContactsId, sysUserId); + + int count = payCaseCommitteeSubitemService.count(wrapper); + if (count > 0) { + isSubItem = true; + } + } else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCouncilSubitem::getCouncilId, payMeeting.getCouncilId()); + wrapper.eq(PayCaseCouncilSubitem::getContactsId, sysUserId); + int count = payCaseCouncilSubitemService.count(wrapper); + if (count > 0) { + isSubItem = true; + } + } + String meetingMinute = payMeeting.getMeetingMinute(); + String meetingData = payMeeting.getMeetingData(); + List fileList = new ArrayList<>(); + if(StringUtils.isNotBlank(meetingMinute)) { + fileList.addAll(Arrays.asList(meetingMinute.split(","))); + } + if(StringUtils.isNotBlank(meetingData)) { + fileList.addAll(Arrays.asList(meetingData.split(","))); + } + if(!fileList.contains(id)){ + throw new JeroBootException("会议无此文件.."); + } + BigDecimal meetingCosts = payMeeting.getMeetingCosts(); + //先判断非成员 + if (!isSubItem){ + //会议金额等于0并且是工作组会议(工作组会议金额为0时可以下载) + if (meetingCosts.compareTo(BigDecimal.ZERO) == 0 && meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ + + }else + + //在判断会议金额是否大于0 + if (meetingCosts.compareTo(BigDecimal.ZERO) > 0){ + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("meeting_id", meetingId); + queryWrapper1.eq("company_contact_id", sysUserId); + PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(queryWrapper1); + if (ObjectUtils.isEmpty(meetingSituation)) { + throw new JeroBootException("未报名会议。"); + } + } + } + + + } }