From 98ebd3dd7521e00ccb8a63fa74c3a7f0b6bead39 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 9 Oct 2021 15:52:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/enums/MessageUrlEnums.java | 24 ++++---- .../service/impl/PayMeetingServiceImpl.java | 2 +- .../impl/PayMeetingSituationServiceImpl.java | 61 +++++++++++-------- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index c900b491..68c29123 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -12,28 +12,28 @@ import com.jero.common.util.oConvertUtils; public enum MessageUrlEnums { // 管理端 - M_OPEN_TYPE1("M_OPEN_TYPE1","component","/ProjectDetailModal"), + M_OPEN_TYPE1("M_OPEN_TYPE1","component","@comp/ProjectDetailModal"), M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"), M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"), M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"), - M_OPEN_TYPE5("M_OPEN_TYPE5","component","/meetManage/modules/AuditModal"), - M_OPEN_TYPE6("M_OPEN_TYPE6","component","/ProjectDetailModal"), - M_OPEN_TYPE7("M_OPEN_TYPE7","component","/ProjectDetailModal"), + M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"), + M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"), + M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"), M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"), M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"), // todo 待定企业端 C_OPEN_TYPE1("C_OPEN_TYPE1","href","http://localhost:3000/signUpEntrance?id"), - C_OPEN_TYPE2("C_OPEN_TYPE2","component",""), - C_OPEN_TYPE3("C_OPEN_TYPE3","component",""), - C_OPEN_TYPE4("C_OPEN_TYPE4","component",""), - C_OPEN_TYPE5("C_OPEN_TYPE5","component",""), - C_OPEN_TYPE6("C_OPEN_TYPE6","component",""), - C_OPEN_TYPE7("C_OPEN_TYPE7","component",""), + C_OPEN_TYPE2("C_OPEN_TYPE2","component","MessagePage/MeetingDetailModal"), + C_OPEN_TYPE3("C_OPEN_TYPE3","component","MessagePage/MeetingDetailModal"), + C_OPEN_TYPE4("C_OPEN_TYPE4","component","MessagePage/MeetingDetailModal"), + C_OPEN_TYPE5("C_OPEN_TYPE5","component","MessagePage/UploadMeetingCertificateModal"), + C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"), + C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"), C_OPEN_TYPE8("C_OPEN_TYPE8","none",""), C_OPEN_TYPE9("C_OPEN_TYPE9","",""), C_OPEN_TYPE10("C_OPEN_TYPE10","",""), - C_OPEN_TYPE11("C_OPEN_TYPE11","component",""), - C_OPEN_TYPE12("C_OPEN_TYPE12","component",""); + C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"), + C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal"); /** * 业务类型(email:邮件 bpm:流程) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 390c5a1c..03af0bdc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -155,7 +155,7 @@ public class PayMeetingServiceImpl 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); + 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); } /** @@ -308,15 +305,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl