diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index e1780416..33ac7a4e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -62,7 +62,7 @@ public class CouncilMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); @@ -77,7 +77,7 @@ public class CouncilMeetingController extends JeroController add(@RequestBody PayMeetingVO payMeetingVO) { String meetingType = payMeetingVO.getMeetingType(); - if (!Objects.equals(meetingType, MeetingCommon.COMMITTEE_MEETING)) { + if (!Objects.equals(meetingType, MeetingCommon.COUNCIL_MEETING)) { throw new RuntimeException(); } ValidUtil.validate(payMeetingVO); @@ -103,7 +103,7 @@ public class CouncilMeetingController extends JeroController queryById(@RequestParam(name = "id") String id) { PayMeeting meeting = payMeetingService.queryById(id); - if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.COMMITTEE_MEETING_INT)) { + if (meeting == null || !Objects.equals(meeting.getMeetingType(), MeetingCommon.COUNCIL_MEETING_INT)) { return Result.error("未找到对应数据"); } //查询会议负责人 @@ -175,11 +175,11 @@ public class CouncilMeetingController extends JeroController queryPageList = payMeetingService.queryPageList(payMeeting, -1, -1, request); List exportList = payMeetingService.getExportList(request,queryPageList); - Class aClass = payMeetingService.getaClass(MeetingCommon.COMMITTEE_MEETING_INT); + Class aClass = payMeetingService.getaClass(MeetingCommon.COUNCIL_MEETING_INT); return super.exportListXls(exportList, aClass, "会议管理"); } @@ -191,7 +191,7 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT); return Result.OK("上传资料成功!"); } @@ -199,11 +199,11 @@ public class CouncilMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT); return Result.OK("上传会议纪要成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 4096e0cc..b206e470 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -212,7 +212,7 @@ public class InternalMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index ab61cfe7..535c8f53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -211,7 +211,7 @@ public class OtherMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 0346be7f..dbbe6f5d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -249,7 +249,7 @@ public class StandardsMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index faec0c51..fbc80382 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -234,7 +234,7 @@ public class WorkGroupMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { 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 8154eac3..a978ef22 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 @@ -27,6 +27,7 @@ import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.PayCaseCommittee; import com.jero.data.entity.PayCaseCommitteeSubitem; import com.jero.data.entity.PayCaseCouncil; +import com.jero.data.entity.PayCaseCouncilSubitem; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilService; @@ -515,7 +516,20 @@ public class PayMeetingServiceImpl extends ServiceImpl payCaseCouncilSubitems = payCaseCouncilSubitemService.listByIds(subitemIds); + for (PayCaseCouncilSubitem payCaseCouncilSubitem : payCaseCouncilSubitems) { + String councilSubitemId = payCaseCouncilSubitem.getId(); + String contactsId = payCaseCouncilSubitem.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(councilSubitemId) + .setContactId(contactsId) + ); + } + }else { throw new JeroBootException("项目类型不正确"); } wrapper.in(PayContactsManagement::getId, contactsIdList);