update 新增标协会议时推送问题征集

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' ;

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;
 }

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;
     }