diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index a91676fc..0f30b2b8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -263,29 +263,32 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); - wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId()); - boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0; - judgeSend(payMeeting, payMeetingSituation1, isSubItem); + Integer identity = payMeetingSituation1.getIdentity(); + //如果是参会人判断是上传了缴费凭证 + if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)){ + if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) { + //工作组以公司为维度 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId()); + wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId()); + boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0; + judgeSend(payMeeting, payMeetingSituation1, isSubItem); - } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { - //分标委以人为维度 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); - wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId()); + } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) { + //分标委以人为维度 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId()); + wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId()); - int count = payCaseCommitteeSubitemService.count(wrapper); - if (count > 0) { - payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); + int count = payCaseCommitteeSubitemService.count(wrapper); + if (count > 0) { + payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); + } } + //上传付款凭证发送邮件提醒审批 + SendPaymentRecordMessage(payMeetingSituation1, payMeeting); } - //上传付款凭证发送邮件提醒审批 - SendPaymentRecordMessage(payMeetingSituation1, payMeeting); } /**