From 05b64d4fd1bd7b125815aad8ee2509fe7691795c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jun 2024 11:37:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?add=20=E6=B5=B7=E5=A4=96=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/shiro/ShiroConfig.java | 1 + .../controller/OverseasMeetingSituationController.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 7af7b777..74b96cd1 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -129,6 +129,7 @@ public class ShiroConfig { //不需要权限的接口 filterChainDefinitionMap.put("/meeting/payMeetingSituation/signUp","anon");//报名 + filterChainDefinitionMap.put("/meeting/overseasSituation/signUp","anon");//海外会议报名 filterChainDefinitionMap.put("/meeting/payMeetingSituation/validInvitationCode","anon");//报名 filterChainDefinitionMap.put("/meeting/payMeeting/queryById","anon");//会议详情 filterChainDefinitionMap.put("/sys/common/upload","anon");//上传文件 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OverseasMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OverseasMeetingSituationController.java index 26c1407d..afad0504 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OverseasMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OverseasMeetingSituationController.java @@ -81,6 +81,15 @@ public class OverseasMeetingSituationController extends JeroController signUp(@RequestBody MeetingOverseasSituation payMeetingSituation) { + overseasSituationService.add(payMeetingSituation, MEETING_TYPE); + return Result.OK("添加成功！"); + } /** * 编辑 From ad0dc6b5ee7882464083c777f9810a1ac0269512 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jun 2024 18:12:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?update=20=E6=B5=B7=E5=A4=96=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 10 ++- .../vo/excel/OverseasMeetingExcel.java | 90 +++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/OverseasMeetingExcel.java 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 227774b6..10695eac 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 @@ -1044,7 +1044,7 @@ public class PayMeetingServiceImpl extends ServiceImpl hotelContactsList; + /** + * 会议联系人列表 + */ + @ExcelCollection(name = "会议联系人列表") + private List meetingContactsList; + + /**备注*/ + @Excel(name = "备注", width = 15) + private String remark; + +} From 059f5d8710e4b32d55124307df821a642ca8721f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 26 Jun 2024 10:58:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=2086403=20=E6=B5=B7=E5=A4=96=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE-=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2--=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=85=A5=E5=A2=83=E5=92=8C=E5=87=BA=E5=A2=83?= =?UTF-8?q?=E5=80=BC=E4=B8=8E=E5=88=97=E8=A1=A8=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/entity/MeetingOverseasSituation.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java index 06ef76ba..14e28524 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java @@ -165,21 +165,21 @@ public class MeetingOverseasSituation { private String passportNo; /** - * 出境日期 + * 入境日期 */ @TableField(value = "entry_date") - @ApiModelProperty(value = "出境日期") - @Excel(name = "出境日期", width = 15, format = "yyyy-MM-dd") + @ApiModelProperty(value = "入境日期") + @Excel(name = "入境日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date entryDate; /** - * 入境日期 + * 出境日期 */ @TableField(value = "exit_date") - @ApiModelProperty(value = "入境日期") - @Excel(name = "入境日期", width = 15, format = "yyyy-MM-dd") + @ApiModelProperty(value = "出境日期") + @Excel(name = "出境日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date exitDate; From dd16296e61f8b8a28e0d84613e3bca8a97807c53 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 26 Jun 2024 10:59:13 +0800 Subject: [PATCH 4/6] update sql --- db/24年6月海外会议变更.sql | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 db/24年6月海外会议变更.sql diff --git a/db/24年6月海外会议变更.sql b/db/24年6月海外会议变更.sql new file mode 100644 index 00000000..66c9c22e --- /dev/null +++ b/db/24年6月海外会议变更.sql @@ -0,0 +1,55 @@ +-- auto-generated definition +create table pay_meeting_overseas_situation +( + id varchar(36) not null comment 'id', + create_by varchar(50) null comment '创建人', + create_time datetime null comment '创建日期', + update_by varchar(50) null comment '更新人', + update_time datetime null comment '更新日期', + meeting_id varchar(50) null comment '会议id', + photo varchar(50) null comment '照片', + name varchar(200) null comment '姓名', + unit varchar(200) null comment '职务及单位', + nationality varchar(200) null comment '国籍', + address varchar(200) null comment '地址', + email varchar(200) null comment '邮箱', + phone varchar(200) null comment '联系电话', + need_visa tinyint(1) null comment '是否需要签证', + foreign_name varchar(200) null comment '外文姓名', + sex varchar(50) null comment '性别', + birthday date null comment '出生日期', + passport_no varchar(200) null comment '护照号码', + entry_date date null comment '出境日期', + exit_date date null comment '入境日期', + embassies_and_consulates varchar(200) null comment '办理签证使领馆', + constraint Index_1 + unique (id) +) + comment '海外会议报名表'; + +create index pm_situation_idx_meeting_id + on pay_meeting_overseas_situation (meeting_id); + +alter table pay_meeting_overseas_situation + add primary key (id); + +insert into sys_permission (id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external, external_terminal_show) +values ('1805490588726943746', '1430376424950026242', '海外会议报名信息编辑页', '/incomePayments/meetManage/SignUpInfoEditOverseas', 'incomePayments/meetManage/SignUpInfoEditOverseas', null, null, 1, null, '1', 13, 0, null, 1, 1, 0, 1, null, 'LKGLZ', '2024-06-25 14:37:55', 'LKGLZ', '2024-06-25 14:43:42', 0, 0, '1', 0, 1), + ('1803343905960304641', '1803335479314161665', '删除', null, null, null, null, 2, 'overseasMeetingSituation:delete', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:46', null, null, 0, 0, '1', 0, 1), + ('1803343796841291778', '1803335479314161665', '编辑', '', null, null, null, 2, 'overseasMeetingSituation:edit', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:20', null, null, 0, 0, '1', 0, 1), + ('1803343698526806018', '1803335479314161665', '批量删除', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:57', null, null, 0, 0, '1', 0, 1), + ('1803343493899296770', '1803335479314161665', '导出', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:08', null, null, 0, 0, '1', 0, 1), + ('1803343388232196098', '1803335479314161665', '添加参会人', '', null, null, null, 2, 'overseasMeetingSituation:add', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:43', null, null, 0, 0, '1', 0, 1), + ('1803343206362980353', '1803335479314161665', '查询', null, null, null, null, 2, 'overseasMeetingSituation:search', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:00', null, null, 0, 0, '1', 0, 1), + ('1803339101372489730', '1803308298231947266', '删除', '', null, null, null, 2, 'overseasMeeting:delete', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:08:41', null, null, 0, 0, '1', 0, 1), + ('1803338998020644865', '1803308298231947266', '编辑', null, null, null, null, 2, 'overseasMeeting:edit', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:08:16', null, null, 0, 0, '1', 0, 1), + ('1803338903925628930', '1803308298231947266', '上传文件', null, null, null, null, 2, 'overseasMeeting:upload', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:07:54', null, null, 0, 0, '1', 0, 1), + ('1803338833180303361', '1803308298231947266', '会议纪要', null, null, null, null, 2, 'overseasMeeting:uploadCouncil', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:07:37', null, null, 0, 0, '1', 0, 1), + ('1803338519882571778', '1803308298231947266', '批量删除', '', null, null, null, 2, 'overseasMeeting:batchDel', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:06:22', null, null, 0, 0, '1', 0, 1), + ('1803338277288222722', '1803308298231947266', '导出', '', null, null, null, 2, 'overseasMeeting:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:05:24', 'LKGLZ', '2024-06-19 16:05:41', 0, 0, '1', 0, 1), + ('1803338186548649985', '1803308298231947266', '新增', null, null, null, null, 2, 'overseasMeeting:add', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:05:03', null, null, 0, 0, '1', 0, 1), + ('1803338041375399938', '1803308298231947266', '查询', '', null, null, null, 2, 'overseasMeeting:search', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:04:28', null, null, 0, 0, '1', 0, 1), + ('1803335479314161665', '1430376424950026242', '海外会议参会情况', '/incomePayments/meetManage/AttendanceOverseasMeeting', 'incomePayments/meetManage/Attendance', null, null, 1, null, '1', 9, 0, null, 1, 0, 0, 1, null, 'LKGLZ', '2024-06-19 15:54:17', null, null, 0, 0, '1', 0, 1), + ('1803308298231947266', '', '海外会议', '/projectManagement/OverseasMeeting', 'projectManagement/OverseasMeeting', null, null, 0, null, '1', 5.1, 0, 'solution', 1, 0, 0, 0, null, 'LKGLZ', '2024-06-19 14:06:17', 'LKGLZ', '2024-06-19 14:11:52', 0, 0, '1', 0, 1); + +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time, update_by, update_time) VALUES ('1803307382065930242', '1432280766382727169', '海外会议', '8', '', 8.00, 1, 'LKGLZ', '2024-06-19 14:02:38', 'LKGLZ', '2024-06-25 10:40:29'); From 4dc6a530c6b2a48dbdaf6dccb962547c3c335566 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 26 Jun 2024 11:35:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix=2086405=20=E6=B5=B7=E5=A4=96=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/meeting/entity/MeetingOverseasSituation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java index 14e28524..82c272f6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java @@ -190,5 +190,5 @@ public class MeetingOverseasSituation { @TableField(value = "embassies_and_consulates") @ApiModelProperty(value = "办理签证使领馆") @Excel(name = "办理签证使领馆", width = 15) - private Integer embassiesAndConsulates; + private String embassiesAndConsulates; } \ No newline at end of file From db7a53ebb32f960c8afd5a5e1863641c7e798682 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 27 Jun 2024 10:42:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?update=20=E6=B5=B7=E5=A4=96=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=8F=82=E4=BC=9A=E4=BA=BA=20=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=8F=8A=E8=81=8C=E5=8A=A1=E6=8B=86=E4=B8=BA=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月海外会议变更.sql | 7 +++++-- .../meeting/entity/MeetingOverseasSituation.java | 15 +++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/db/24年6月海外会议变更.sql b/db/24年6月海外会议变更.sql index 66c9c22e..a7683831 100644 --- a/db/24年6月海外会议变更.sql +++ b/db/24年6月海外会议变更.sql @@ -9,7 +9,8 @@ create table pay_meeting_overseas_situation meeting_id varchar(50) null comment '会议id', photo varchar(50) null comment '照片', name varchar(200) null comment '姓名', - unit varchar(200) null comment '职务及单位', + unit varchar(200) null comment '单位', + post varchar(200) null comment '职务', nationality varchar(200) null comment '国籍', address varchar(200) null comment '地址', email varchar(200) null comment '邮箱', @@ -33,11 +34,13 @@ create index pm_situation_idx_meeting_id alter table pay_meeting_overseas_situation add primary key (id); + + insert into sys_permission (id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external, external_terminal_show) values ('1805490588726943746', '1430376424950026242', '海外会议报名信息编辑页', '/incomePayments/meetManage/SignUpInfoEditOverseas', 'incomePayments/meetManage/SignUpInfoEditOverseas', null, null, 1, null, '1', 13, 0, null, 1, 1, 0, 1, null, 'LKGLZ', '2024-06-25 14:37:55', 'LKGLZ', '2024-06-25 14:43:42', 0, 0, '1', 0, 1), ('1803343905960304641', '1803335479314161665', '删除', null, null, null, null, 2, 'overseasMeetingSituation:delete', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:46', null, null, 0, 0, '1', 0, 1), ('1803343796841291778', '1803335479314161665', '编辑', '', null, null, null, 2, 'overseasMeetingSituation:edit', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:27:20', null, null, 0, 0, '1', 0, 1), - ('1803343698526806018', '1803335479314161665', '批量删除', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:57', null, null, 0, 0, '1', 0, 1), + ('1803343698526806018', '1803335479314161665', '批量删除', '', null, null, null, 2, 'overseasMeetingSituation:batchDel', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:57', null, null, 0, 0, '1', 0, 1), ('1803343493899296770', '1803335479314161665', '导出', '', null, null, null, 2, 'overseasMeetingSituation:export', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:26:08', null, null, 0, 0, '1', 0, 1), ('1803343388232196098', '1803335479314161665', '添加参会人', '', null, null, null, 2, 'overseasMeetingSituation:add', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:43', null, null, 0, 0, '1', 0, 1), ('1803343206362980353', '1803335479314161665', '查询', null, null, null, null, 2, 'overseasMeetingSituation:search', '1', 1, 0, null, 1, 1, 0, 0, null, 'LKGLZ', '2024-06-19 16:25:00', null, null, 0, 0, '1', 0, 1), diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java index 82c272f6..a5db50e1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/MeetingOverseasSituation.java @@ -82,11 +82,19 @@ public class MeetingOverseasSituation { private String name; /** - * 职务及单位 + * 职务 + */ + @TableField(value = "post") + @ApiModelProperty(value = "职务") + @Excel(name = "职务", width = 15) + private String post; + + /** + * 单位 */ @TableField(value = "unit") - @ApiModelProperty(value = "职务及单位") - @Excel(name = "职务及单位", width = 15) + @ApiModelProperty(value = "单位") + @Excel(name = "单位", width = 15) private String unit; /** @@ -135,7 +143,6 @@ public class MeetingOverseasSituation { */ @TableField(value = "foreign_name") @ApiModelProperty(value = "外文姓名") - @Excel(name = "外文姓名", width = 15) private String foreignName; /**