From b6da27c62856440fd763b11509dd1b1664592ef7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 7 Jul 2022 10:57:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=97=B6=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=BE=81=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/22年7月变更.sql                                |  4 ++--
 .../entity/StableCrossTraining.java               | 15 +++++++++++++++
 .../impl/StableCrossTrainingServiceImpl.java      |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql
index b73b71cd..93663c5f 100644
--- a/db/22年7月变更.sql
+++ b/db/22年7月变更.sql
@@ -1,4 +1,4 @@
-//7月变更 2022-7-4  征集问题
+-- 7月变更 2022-7-4  征集问题
 ALTER TABLE `pay_meeting` add COLUMN `is_add_question` tinyint(1) NULL DEFAULT NULL COMMENT '是否需要问题征集（0：否，1：是）' ;
 ALTER TABLE `pay_meeting` add COLUMN `end_time_add_question` datetime NULL DEFAULT NULL COMMENT '征集截止日期' ;
 ALTER TABLE `pay_meeting` add COLUMN `questions` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '征集问题text' ;
@@ -20,7 +20,7 @@ CREATE TABLE `pay_meeting_question`  (
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `id`(`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议征集问题' ROW_FORMAT = Dynamic;
-//分标委
+-- 分标委
 ALTER TABLE `pay_case_committee` add COLUMN `principal_id_a` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人Aid' ;
 ALTER TABLE `pay_case_committee` add COLUMN `principal_name_a` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人名称A' ;
 ALTER TABLE `pay_case_committee` add COLUMN `principal_id_b` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人Bid' ;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java
index 43d0875f..455a8098 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java
@@ -294,5 +294,20 @@ public class StableCrossTraining extends JeroEntity {
     @TableField(exist = false)
     private String order;
 
+    /**是否需要问题征集*/
+    @Dict(dicCode = "yn")
+    @Excel(name = "是否征集问题", width = 20,dicCode ="yn")
+    @ApiModelProperty(value = "是否需要问题征集")
+    private String isAddQuestion;
 
+    /**征集问题text*/
+    @ApiModelProperty(value = "征集问题text")
+    private String questions;
+
+    /**征集截止日期*/
+    @Excel(name = "征集截止日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "征集截止日期")
+    private java.util.Date endTimeAddQuestion;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
index 36e11d63..841aaaa1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
@@ -118,6 +118,10 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
             hotelList.add(hotelContact);
         }
         stableCrossTraining.setHotelList(hotelList);
+        //问题征集
+        stableCrossTraining.setIsAddQuestion(payMeeting.getIsAddQuestion());
+        stableCrossTraining.setQuestions(payMeeting.getQuestions());
+        stableCrossTraining.setEndTimeAddQuestion(payMeeting.getEndTimeAddQuestion());
         return stableCrossTraining;
     }