From bba13910ec11393dc2914b9a86e2ac9bb598f00d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 23 Oct 2023 16:01:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/entity/PayMeetingSituation.java   |  3 ++-
 .../com/jero/meeting/vo/PayMeetingVO.java     |  1 +
 .../vo/excel/InternationalMeetingExcel.java   | 23 +++++++++++++++++++
 .../vo/excel/InternationalSituationExcel.java |  7 ++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index b16a71e7..f79a9cba 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -125,8 +125,9 @@ public class PayMeetingSituation implements Serializable {
     @Max(value = 4,groups = Guest.class)
     private Integer guestType;
 
-    /**演讲题目*/
+    /**课题名称*/
     @Excel(name = "课题名称", width = 15)
+    @Dict(dicCode = "linkTopics")
     @ApiModelProperty(value = "课题名称")
     @Size(max = 50, message = "课题名称最多为50个字符")
     private String choiceTopic;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index c2355843..223c8659 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -213,6 +213,7 @@ public class PayMeetingVO implements Serializable {
 
     /**关联课题*/
     @Excel(name = "关联课题", width = 15)
+    @Dict(dicCode = "linkTopics")
     @ApiModelProperty(value = "关联课题")
     @Size(max = 50, message = "关联课题最多为50个字符")
     private String linkTopics;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java
index d0f5fb1f..ace850cc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java
@@ -1,13 +1,20 @@
 package com.jero.meeting.vo.excel;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import com.jero.meeting.entity.PayMeetingContacts;
 import com.jero.meeting.entity.PayMeetingHotelContacts;
 import com.jero.meeting.valid.group.InternationalMeeting;
+import com.jero.meeting.valid.group.InternationalMeetingWasic;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 
+import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 import java.util.List;
@@ -90,6 +97,22 @@ public class InternationalMeetingExcel {
     @Excel(name = "参展商邀请码", width = 15)
     private java.lang.String exhibitorInvitationCode;
 
+    /**是否WASIC*/
+    @Excel(name = "是否WASIC", width = 15, dicCode = "yn")
+    private Integer isWasic;
+
+    /**关联课题*/
+    @Excel(name = "关联课题", width = 15, dicCode = "linkTopics")
+    private String linkTopics;
+
+    /**会议费用（2个课题）*/
+    @Excel(name = "会议费用（2个课题）", width = 15)
+    private BigDecimal meetingCostsTwoTopic;
+
+    /**会议费用（3个及以上）*/
+    @Excel(name = "会议费用（3个及以上）", width = 15)
+    private BigDecimal meetingCostsThreeTopic;
+
     /**酒店名称*/
     @Excel(name = "酒店名称", width = 15)
     private String hotelName;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
index 7ca1141c..92048454 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
@@ -1,9 +1,12 @@
 package com.jero.meeting.vo.excel;
 
 import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import javax.validation.constraints.Size;
+
 /**
  * @author liJiaRao
  * @date 2021-09-22 15:39
@@ -44,6 +47,10 @@ public class InternationalSituationExcel extends SituationBaseExcel {
     @Excel(name = "嘉宾类型", width = 15,dicCode = "guest_type")
     private Integer guestType;
 
+    /**课题名称*/
+    @Excel(name = "课题名称", width = 15, dicCode = "linkTopics")
+    private String choiceTopic;
+
     /**演讲题目*/
     @Excel(name = "演讲题目", width = 15)
     private String speechTopic;