Эх сурвалжийг харах

旅游项目增加费用说明和预定须知字段

chenchen 6 сар өмнө
parent
commit
b89f4af900

+ 15 - 9
application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/TourismContentMapper.xml

@@ -10,18 +10,22 @@
         <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="data_state" jdbcType="TINYINT" property="dataState"/>
+        <result column="cost_description" jdbcType="LONGVARCHAR" property="costDescription"/>
+        <result column="booking_notice" jdbcType="LONGVARCHAR" property="bookingNotice"/>
     </resultMap>
 
     <insert id="insertList">
         INSERT INTO tour_tourism_content
-            (id,
-            content,
-            association_id,
-            create_user_id,
-            create_time,
-            update_user_id,
-            update_time,
-            data_state)
+        (id,
+        content,
+        association_id,
+        create_user_id,
+        create_time,
+        update_user_id,
+        update_time,
+        data_state,
+        cost_description,
+        booking_notice)
         VALUES
         <foreach collection="list" index="index" item="item" separator="," >
             (#{item.id},
@@ -31,7 +35,9 @@
             #{item.createTime},
             #{item.updateUserId},
             #{item.updateTime},
-            #{item.dataState})
+            #{item.dataState},
+            #{item.costDescription},
+            #{item.bookingNotice})
         </foreach>
     </insert>
 

+ 12 - 0
application-webadmin/src/main/java/com/tourism/webadmin/back/dto/TourismContentDto.java

@@ -36,4 +36,16 @@ public class TourismContentDto {
     @Schema(description = "关联表id。", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "数据验证失败,关联表id不能为空!", groups = {UpdateGroup.class})
     private Long associationId;
+
+    /**
+     * 费用说明。
+     */
+    @Schema(description = "费用说明。")
+    private String costDescription;
+
+    /**
+     * 预定须知。
+     */
+    @Schema(description = "预定须知。")
+    private String bookingNotice;
 }

+ 12 - 0
application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismContent.java

@@ -40,4 +40,16 @@ public class TourismContent extends BaseModel {
     @TableLogic
     @TableField(value = "data_state")
     private Integer dataState;
+
+    /**
+     * 费用说明。
+     */
+    @TableField(value = "cost_description")
+    private String costDescription;
+
+    /**
+     * 预定须知。
+     */
+    @TableField(value = "booking_notice")
+    private String bookingNotice;
 }

+ 16 - 4
application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourismContentVo.java

@@ -1,12 +1,12 @@
 package com.tourism.webadmin.back.vo;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.tourism.common.core.base.vo.BaseVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 旅游富文本VO视图对象。
  *
@@ -22,7 +22,7 @@ public class TourismContentVo extends BaseVo {
      * 主键id。
      */
     @Schema(description = "主键id")
-    private String id;
+    private Long id;
 
     /**
      * 富文本内容。
@@ -34,5 +34,17 @@ public class TourismContentVo extends BaseVo {
      * 关联表id。
      */
     @Schema(description = "关联表id")
-    private String associationId;
+    private Long associationId;
+
+    /**
+     * 费用说明。
+     */
+    @Schema(description = "费用说明")
+    private String costDescription;
+
+    /**
+     * 预定须知。
+     */
+    @Schema(description = "预定须知")
+    private String bookingNotice;
 }