Merge branch '24年6月海外会议'
This commit is contained in:
lijiarao
@@ -0,0 +1,58 @@
|
||||
-- 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 '单位',
|
||||
post 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: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),
|
||||
('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');
|
||||
+1
@@ -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");//上传文件
|
||||
|
||||
+9
@@ -81,6 +81,15 @@ public class OverseasMeetingSituationController extends JeroController<MeetingOv
|
||||
overseasSituationService.add(payMeetingSituation, MEETING_TYPE);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
/**
|
||||
* 报名
|
||||
*/
|
||||
@ApiOperation(value = "参会人员信息-报名", notes = "参会人员信息-报名")
|
||||
@PostMapping(value = "/signUp")
|
||||
public Result<?> signUp(@RequestBody MeetingOverseasSituation payMeetingSituation) {
|
||||
overseasSituationService.add(payMeetingSituation, MEETING_TYPE);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
|
||||
+18
-11
@@ -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;
|
||||
|
||||
/**
|
||||
@@ -165,21 +172,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;
|
||||
@@ -190,5 +197,5 @@ public class MeetingOverseasSituation {
|
||||
@TableField(value = "embassies_and_consulates")
|
||||
@ApiModelProperty(value = "办理签证使领馆")
|
||||
@Excel(name = "办理签证使领馆", width = 15)
|
||||
private Integer embassiesAndConsulates;
|
||||
private String embassiesAndConsulates;
|
||||
}
|
||||
+8
-2
@@ -1044,7 +1044,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
}else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)) {
|
||||
permission = "draftGroupMeeting:search";
|
||||
}else if (meetingType.equals(MeetingCommon.OVERSEAS_MEETING_INT)) {
|
||||
permission = "draftGroupMeeting:search";
|
||||
permission = "overseasMeeting:search";
|
||||
}
|
||||
}
|
||||
if (StringUtils.isNotBlank(permission)) {
|
||||
@@ -1420,7 +1420,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
}else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)){
|
||||
classToExport = DraftingGroupMeetingExcel.class;
|
||||
}else if (meetingType.equals(MeetingCommon.OVERSEAS_MEETING_INT)){
|
||||
classToExport = DraftingGroupMeetingExcel.class;
|
||||
classToExport = OverseasMeetingExcel.class;
|
||||
}
|
||||
return classToExport;
|
||||
}
|
||||
@@ -1528,6 +1528,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
||||
BeanUtils.copyProperties(payMeetingVO, draftingGroupMeetingExcel);
|
||||
exportList.add(draftingGroupMeetingExcel);
|
||||
break;
|
||||
case MeetingCommon.OVERSEAS_MEETING:
|
||||
//保存数据
|
||||
OverseasMeetingExcel overseasMeetingExcel = new OverseasMeetingExcel();
|
||||
BeanUtils.copyProperties(payMeetingVO, overseasMeetingExcel);
|
||||
exportList.add(overseasMeetingExcel);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return exportList;
|
||||
|
||||
+90
@@ -0,0 +1,90 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.meeting.entity.PayMeetingContacts;
|
||||
import com.jero.meeting.entity.PayMeetingHotelContacts;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecgframework.poi.excel.annotation.ExcelCollection;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
public class OverseasMeetingExcel {
|
||||
|
||||
/**会议名称*/
|
||||
@Excel(name = "会议名称", width = 15)
|
||||
private String meetingName;
|
||||
|
||||
/**会议类型*/
|
||||
@Excel(name = "会议类型", width = 15)
|
||||
private String meetingType;
|
||||
|
||||
/**开始时间*/
|
||||
@Excel(name = "会议开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date startTime;
|
||||
|
||||
/**结束时间*/
|
||||
@Excel(name = "会议结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date endTime;
|
||||
|
||||
/**年份*/
|
||||
@Excel(name = "年份", width = 15)
|
||||
private String particularYear;
|
||||
|
||||
/**召开地点*/
|
||||
@Excel(name = "召开地点", width = 15)
|
||||
private String venue;
|
||||
|
||||
/**详细地址*/
|
||||
@Excel(name = "详细地址", width = 15)
|
||||
private String address;
|
||||
|
||||
/**预计参加人数*/
|
||||
@Excel(name = "预计参加人数", width = 15)
|
||||
private String estimatedNumber;
|
||||
|
||||
/**会议内容*/
|
||||
@Excel(name = "会议内容", width = 15)
|
||||
private String meetingContent;
|
||||
|
||||
/**报名截止时间*/
|
||||
@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date registerDeadline;
|
||||
|
||||
/**会议费用*/
|
||||
@Excel(name = "会议费用", width = 15)
|
||||
private BigDecimal meetingCosts;
|
||||
|
||||
/**会议负责人*/
|
||||
@Excel(name = "会议负责人", width = 15)
|
||||
private String directorName;
|
||||
|
||||
/**会议负责人手机号*/
|
||||
@Excel(name = "会议负责人手机号", width = 15)
|
||||
private String directorPhone;
|
||||
|
||||
/**酒店名称*/
|
||||
@Excel(name = "酒店名称", width = 15)
|
||||
private String hotelName;
|
||||
|
||||
/**酒店地址*/
|
||||
@Excel(name = "酒店地址", width = 15)
|
||||
private String hotelAddress;
|
||||
|
||||
/**
|
||||
* 会议关联酒店联系人列表
|
||||
*/
|
||||
private List<PayMeetingHotelContacts> hotelContactsList;
|
||||
/**
|
||||
* 会议联系人列表
|
||||
*/
|
||||
@ExcelCollection(name = "会议联系人列表")
|
||||
private List<PayMeetingContacts> meetingContactsList;
|
||||
|
||||
/**备注*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
private String remark;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user