From ad0dc6b5ee7882464083c777f9810a1ac0269512 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 25 Jun 2024 18:12:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=B7=E5=A4=96=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=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<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;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/OverseasMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/OverseasMeetingExcel.java
new file mode 100644
index 00000000..98db0e1e
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/OverseasMeetingExcel.java
@@ -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;
+
+}