From d761c9997485fc028fefb01ea6547bc87ca5421b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 29 Dec 2021 15:50:40 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/元旦前上线新增.sql | 15 ++++++++++++++- .../controller/InternalMeetingController.java | 13 ++++++++++++- .../controller/OtherMeetingController.java | 14 +++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/db/元旦前上线新增.sql b/db/元旦前上线新增.sql index e15a9b31..bfcd630d 100644 --- a/db/元旦前上线新增.sql +++ b/db/元旦前上线新增.sql @@ -6,4 +6,17 @@ VALUES ('1476073127111663617', '发布状态', 'release', '', 0, 'LKGLZ', '2021- INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time) VALUES ('1476073184066117633', '1476073127111663617', '未发布', '0', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:45'); INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time) -VALUES ('1476073211874353153', '1476073127111663617', '已发布', '1', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:52'); \ No newline at end of file +VALUES ('1476073211874353153', '1476073127111663617', '已发布', '1', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:52'); + +INSERT INTO sys_permission (id, parent_id, name, perms, perms_type, sort_no, menu_type, is_leaf, is_route, keep_alive, + create_by, del_flag, hidden, create_time, status, always_show, internal_or_external) +VALUES ('1476097581552345089', '1438072102897672193', '发布', 'internalMeeting:release', '1', 1.0, 2, true, true, false, + 'LKGLZ', 0, false, '2021-12-29 15:47:42', '1', false, false); +INSERT INTO sys_permission (id, parent_id, name, perms, perms_type, sort_no, menu_type, is_leaf, is_route, keep_alive, + create_by, del_flag, hidden, create_time, status, always_show, internal_or_external) +VALUES ('1476097698292408321', '1438072308749918210', '发布', 'otherMeeting:release', '1', 1.0, 2, true, true, false, + 'LKGLZ', 0, false, '2021-12-29 15:48:10', '1', false, false); +INSERT INTO sys_permission (id, parent_id, name, perms, perms_type, sort_no, menu_type, is_leaf, is_route, keep_alive, + create_by, del_flag, hidden, create_time, status, always_show, internal_or_external) +VALUES ('1476097803296808961', '1443470646404014081', '发布', 'standardsMeeting:release', '1', 1.0, 2, true, true, false, + 'LKGLZ', 0, false, '2021-12-29 15:48:35', '1', false, false); \ No newline at end of file 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 2e51ee82..3723becb 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 @@ -19,6 +19,7 @@ import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.vo.PayMeetingVO; +import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; @@ -218,5 +219,15 @@ public class InternalMeetingController extends JeroController release(@RequestBody PublishReminderVO publishReminderVO) { + payMeetingService.release(publishReminderVO); + return Result.OK(); + } } 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 cb375c8b..f2a67bdf 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 @@ -19,6 +19,7 @@ import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.vo.PayMeetingVO; +import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; @@ -189,7 +190,7 @@ public class OtherMeetingController extends JeroController queryPageList = payMeetingService.queryPageList(payMeeting, -1, -1, request); - List exportList = payMeetingService.getExportList(request,queryPageList); + List exportList = payMeetingService.getExportList(request, queryPageList); Class aClass = payMeetingService.getaClass(MeetingCommon.OTHER_MEETING_INT); return super.exportListXls(exportList, aClass, "会议管理"); } @@ -218,4 +219,15 @@ public class OtherMeetingController extends JeroController release(@RequestBody PublishReminderVO publishReminderVO) { + payMeetingService.release(publishReminderVO); + return Result.OK(); + } }