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 2bd3c4f5..f2d1165d 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 @@ -25,6 +25,7 @@ import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingContacts; import com.jero.meeting.entity.PayMeetingHotelContacts; @@ -465,22 +466,9 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); - wrapper.and(i -> i.eq(PayWorkingGroupSubItem::getContactsIdOne, sysUserId) - .or() - .eq(PayWorkingGroupSubItem::getContactsIdTwo, sysUserId) - .or() - .eq(PayWorkingGroupSubItem::getContactsIdThree, sysUserId) - ); - int count = payWorkingGroupSubItemService.count(wrapper); - if (count > 0) { - isSubItem = true; - } - } else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) { + if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); wrapper.eq(PayCaseCommitteeSubitem::getContactsId, sysUserId); @@ -512,16 +500,18 @@ public class PayMeetingController extends JeroController queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("meeting_id", meetingId); queryWrapper1.eq("company_contact_id", sysUserId); - PayMeetingSituation one = payMeetingSituationService.getOne(queryWrapper1); - if (ObjectUtils.isEmpty(one)) { + PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(queryWrapper1); + if (ObjectUtils.isEmpty(meetingSituation)) { throw new JeroBootException("未报名会议。"); } - Integer checkResult = one.getCheckResult(); - if (checkResult != 1) { + Integer checkResult = meetingSituation.getCheckResult(); + Integer registerCheckResult = meetingSituation.getRegisterCheckResult(); + if (!Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) + || !Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) { throw new JeroBootException("会议报名并审核通过后才可查看文件"); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index 216fe28b..3a6fc209 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -67,6 +67,7 @@ hotel_address, meeting_files, meeting_data, + meeting_minute, remind, payment_qr_code, case_committee_id, @@ -119,6 +120,7 @@ hotel_address, meeting_files, meeting_data, + meeting_minute, remind, payment_qr_code, case_committee_id,