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 3d4d40b2..1371b0dd 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 @@ -21,8 +21,13 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.PayCaseCommittee; +import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.PayCaseCouncilSubitem; 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.PayMeetingHotelContacts; import com.jero.meeting.entity.PayMeetingSituation; @@ -39,7 +44,9 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.util.QrcodeUtil; import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; @@ -89,6 +96,12 @@ 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)) { + LambdaQueryWrapper 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<>(); @@ -475,8 +522,8 @@ public class PayMeetingController extends JeroController queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("meeting_id", meetingId); queryWrapper1.eq("company_contact_id", sysUserId);