From 178a6f3f1050f38338031317322c1514fc4ff45e Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jan 2024 11:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=B7=E8=8D=89=E7=BB=84-?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE-=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E5=AF=BC=E5=87=BA,=E5=AE=A1=E6=A0=B8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E4=BF=A1=E6=81=AF,=E6=89=B9=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=B5=84=E6=96=99=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DraftGroupMeetingSituationController.java | 77 ++++++++++++++- .../impl/PayMeetingSituationServiceImpl.java | 9 +- .../vo/excel/DraftingGroupMeetingExcel.java | 98 +++++++++++++++++++ .../vo/excel/DraftingGroupSituationExcel.java | 75 ++++++++++++++ 4 files changed, 254 insertions(+), 5 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupMeetingExcel.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index dea89b35..95ef1ac2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -6,14 +6,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.aspect.annotation.CompanyNameTranslate; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.ValidUtil; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.PayMeetingSituationVO; +import com.jero.meeting.vo.SetGuestsUploadFileVO; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -29,10 +34,8 @@ import java.util.List; import java.util.Objects; /** - * @description: 参会人员信息 - * @author: jero-boot - * @date: 2021-09-02 - * @version: V1.0 + * 起草组会议 参会人信息 + * 2024-01-08 */ @Api(tags = "参会人员信息-起草组会议") @RestController @@ -132,4 +135,70 @@ public class DraftGroupMeetingSituationController extends JeroController queryById(@RequestParam(name = "id") String id) { + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryById(id); + if (payMeetingSituation == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMeetingSituation); + } + + /** + * 通过会议id查询自己的参会人信息 + */ +// @CompanyNameTranslate +// @DictPoint + @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息") + @GetMapping(value = "/queryByMeetingId") + public Result queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + if (payMeetingSituation == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMeetingSituation); + } + + /** + * 审核报名信息 + */ + @AutoLog(value = "审核报名信息") +// @RequiresPermissions("draftGroupMeetingSituation:auditSignUp") + @ApiOperation(value = "审核报名信息") + @PostMapping(value = "/checkRegister") + public Result checkRegister(@RequestBody CheckVO checkVO) { + payMeetingSituationService.checkRegister(checkVO); + return Result.OK("审核成功!"); + } + + /** + * 设置嘉宾上传文件 + */ +// @RequiresPermissions("draftGroupMeetingSituation:guestsUploadFileFlag") + @AutoLog(value = "设置嘉宾上传文件") + @ApiOperation(value = "设置嘉宾上传文件", notes = "设置嘉宾上传文件") + @PostMapping(value = "/setGuestsUploadFile") + public Result setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("设置嘉宾上传文件成功!"); + } + + /** + * 导出excel + */ +// @RequiresPermissions("draftGroupMeetingSituation:export") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) { + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); + } } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index a5580b39..24522b0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1728,9 +1728,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl hotelContactsList; + /** + * 会议联系人列表 + */ + @ExcelCollection(name = "会议联系人列表") + private List meetingContactsList; + + /**备注*/ + @Excel(name = "备注", width = 15) + private String remark; + + /**通知正文*/ + @Excel(name = "通知正文", width = 15,orderNum = "1") + private String notice; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java new file mode 100644 index 00000000..647ec1da --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java @@ -0,0 +1,75 @@ +package com.jero.meeting.vo.excel; + +import com.jero.common.aspect.annotation.Dict; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +@Data +public class DraftingGroupSituationExcel extends SituationBaseExcel { + + /**会议id*/ + @Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name") + private String meetingId; + + /**企业id*/ + @Excel(name = "企业名称", width = 15) + private String companyName; + + /**企业联系人id*/ + @Excel(name = "企业联系人名称", width = 15) + private String companyContactName; + + /**职务*/ + @Excel(name = "职务", width = 15) + private String post; + + /**手机号*/ + @Excel(name = "手机号", width = 15) + private String phone; + + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + private String email; + + /**身份*/ + @Dict(dicCode = "meet_identify_type") + @Excel(name = "身份", width = 15,dicCode = "meet_identify_type") + private Integer identity; + + /**是否入住协议酒店*/ + @Excel(name = "是否入住酒店", width = 15,dicCode = "yn") + private Integer checkInHotel; + + /**抵达时间*/ + @Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd") + private java.util.Date arrivalTime; + + /**离开时间*/ + @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd") + private java.util.Date departureTime; + + /**邮寄联系人*/ + @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + private String postContactId; + + /**邮寄联系人地址*/ + @Excel(name = "邮寄联系人地址", width = 15) + private String postContactAddress; + + /**邮编*/ + @Excel(name = "邮编", width = 15) + private String postCode; + + /**缴费方式*/ + @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") + private Integer payMode; + + /**需要发票*/ + @Excel(name = "需要发票", width = 15,dicCode = "invoice_type") + private Integer needInvoice; + + /**订单后4位编码*/ + @Excel(name = "订单后4位编码", width = 15) + private String orderCode; + +}