傅行帆 3 лет назад
Родитель
Сommit
8962bd7942

+ 3
- 0
src/main/java/com/yunzhi/marketing/entity/TaBuilding.java Просмотреть файл

372
      */
372
      */
373
     private String marketingCode;
373
     private String marketingCode;
374
 
374
 
375
+    /** 是否文旅商办 */
376
+    private Integer isCommerce ;
377
+
375
     /**
378
     /**
376
      * 项目亮点封面
379
      * 项目亮点封面
377
      */
380
      */

+ 8
- 0
src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java Просмотреть файл

232
     @TableField(exist = false)
232
     @TableField(exist = false)
233
     private Integer enlisted;
233
     private Integer enlisted;
234
 
234
 
235
+    /**
236
+     * dymic 普通活动 house 团房活动
237
+     */
235
     private String type;
238
     private String type;
239
+
240
+    /**
241
+     * 副标题
242
+     */
243
+    private String halfTitle;
236
 }
244
 }

+ 2
- 0
src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java Просмотреть файл

7
 @Data
7
 @Data
8
 public class LiveAndVideoVO {
8
 public class LiveAndVideoVO {
9
 
9
 
10
+    private String id;
11
+
10
     private String title;
12
     private String title;
11
 
13
 
12
     private LocalDate startTime;
14
     private LocalDate startTime;

+ 2
- 0
src/main/resources/mapper/TaLiveActivityMapper.xml Просмотреть файл

73
 
73
 
74
     <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.po.LiveAndVideoVO">
74
     <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.po.LiveAndVideoVO">
75
         SELECT
75
         SELECT
76
+            t.live_activity_id as id,
76
             t.live_activity_title AS title,
77
             t.live_activity_title AS title,
77
             t.live_start_date AS start_time,
78
             t.live_start_date AS start_time,
78
             t.live_end_date AS end_time,
79
             t.live_end_date AS end_time,
91
         </if>
92
         </if>
92
     UNION
93
     UNION
93
         SELECT
94
         SELECT
95
+            t.video_id as id,
94
             t.NAME AS title,
96
             t.NAME AS title,
95
             t.CREATED_TIME AS startTime,
97
             t.CREATED_TIME AS startTime,
96
             t.CREATED_TIME AS endTime,
98
             t.CREATED_TIME AS endTime,