From 28d2e649855c49fe7c6b0849a5d0d28c9a980520 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 18:30:37 +0800
Subject: [PATCH] 报事报修步骤和评分表

---
 src/main/java/org/springblade/modules/task/mapper/TaskRepairAppraiseMapper.xml  |    5 ++
 src/main/java/org/springblade/modules/task/mapper/TaskRepairStepMapper.xml      |   11 +++--
 src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java     |   16 +++++--
 src/main/java/org/springblade/modules/task/entity/TaskRepairAppraiseEntity.java |   32 ++++++---------
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskRepairAppraiseEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskRepairAppraiseEntity.java
index 4dac88b..8469d8a 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskRepairAppraiseEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskRepairAppraiseEntity.java
@@ -40,46 +40,40 @@
 	private static final long serialVersionUID = 1L;
 
 
-	/**
-	 * id
-	 */
+
+	/** id */
 	@ApiModelProperty(value = "主键ID", example = "")
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
-	/**
-	 * 内容
-	 */
+	/** 内容 */
 	@ApiModelProperty(value = "内容", example = "")
 	@TableField("content")
 	private String content;
 
-	/**
-	 * 创建时间
-	 */
+	/** 创建时间 */
 	@ApiModelProperty(value = "创建时间", example = "")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField(value = "create_time",fill = FieldFill.INSERT)
+	@TableField("create_time")
 	private Date createTime;
 
-	/**
-	 * 图片
-	 */
+	/** 图片 */
 	@ApiModelProperty(value = "图片", example = "")
 	@TableField("image_list")
 	private String imageList;
 
-	/**
-	 * 评分数
-	 */
+	/** 评分数 */
 	@ApiModelProperty(value = "评分数", example = "")
 	@TableField("point")
 	private String point;
 
-	/**
-	 * 事件id
-	 */
+	/** 事件id */
 	@ApiModelProperty(value = "事件id", example = "")
 	@TableField("repair_id")
 	private Long repairId;
+
+	/** 视频 */
+	@ApiModelProperty(value = "视频", example = "")
+	@TableField("video_list")
+	private String videoList;
 }
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java
index bea97d6..bf914f0 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskRepairStepEntity.java
@@ -39,6 +39,7 @@
 	private static final long serialVersionUID = 1L;
 
 
+
 	/** id */
 	@ApiModelProperty(value = "主键ID", example = "")
 	@TableId(value = "id", type = IdType.AUTO)
@@ -54,10 +55,10 @@
 	@TableField("content")
 	private String content;
 
-	/** 图片 */
-	@ApiModelProperty(value = "图片", example = "")
-	@TableField("image_list")
-	private String imageList;
+	/** 视频 */
+	@ApiModelProperty(value = "视频", example = "")
+	@TableField("video_list")
+	private String videoList;
 
 	/** 名字 */
 	@ApiModelProperty(value = "名字", example = "")
@@ -82,7 +83,7 @@
 	/** 创建时间 */
 	@ApiModelProperty(value = "创建时间", example = "")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField(value = "create_time",fill = FieldFill.INSERT)
+	@TableField("create_time")
 	private Date createTime;
 
 	/** 更新时间 */
@@ -91,4 +92,9 @@
 	@TableField("update_time")
 	private Date updateTime;
 
+	/** 图片 */
+	@ApiModelProperty(value = "图片", example = "")
+	@TableField("image_list")
+	private String imageList;
+
 }
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskRepairAppraiseMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskRepairAppraiseMapper.xml
index 40dcc19..5c7a3df 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskRepairAppraiseMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskRepairAppraiseMapper.xml
@@ -18,6 +18,7 @@
         <result property="imageList"    column="image_list"    />
         <result property="point"    column="point"    />
         <result property="repairId"    column="repair_id"    />
+        <result property="videoList"    column="video_list"    />
     </resultMap>
 
     <sql id="selectTaskRepairAppraise">
@@ -27,7 +28,8 @@
             create_time,
             image_list,
             point,
-            repair_id
+            repair_id,
+            video_list
         from
             jczz_task_repair_appraise
     </sql>
@@ -47,6 +49,7 @@
             <if test="imageList != null  and imageList != ''"> and image_list = #{imageList}</if>
             <if test="point != null  and point != ''"> and point = #{point}</if>
             <if test="repairId != null "> and repair_id = #{repairId}</if>
+            <if test="videoList != null  and videoList != ''"> and video_list = #{videoList}</if>
         </where>
     </select>
 </mapper>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskRepairStepMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskRepairStepMapper.xml
index 117446b..1ae152e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskRepairStepMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskRepairStepMapper.xml
@@ -16,13 +16,14 @@
         <result property="id"    column="id"    />
         <result property="repairId"    column="repair_id"    />
         <result property="content"    column="content"    />
-        <result property="imageList"    column="image_list"    />
+        <result property="videoList"    column="video_list"    />
         <result property="name"    column="name"    />
         <result property="mobile"    column="mobile"    />
         <result property="userId"    column="user_id"    />
         <result property="peopleType"    column="people_type"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="imageList"    column="image_list"    />
     </resultMap>
 
     <sql id="selectTaskRepairStep">
@@ -30,13 +31,14 @@
             id,
             repair_id,
             content,
-            image_list,
+            video_list,
             name,
             mobile,
             user_id,
             people_type,
             create_time,
-            update_time
+            update_time,
+            image_list
         from
             jczz_task_repair_step
     </sql>
@@ -53,13 +55,14 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="repairId != null "> and repair_id = #{repairId}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="imageList != null  and imageList != ''"> and image_list = #{imageList}</if>
+            <if test="videoList != null  and videoList != ''"> and video_list = #{videoList}</if>
             <if test="name != null  and name != ''"> and name = #{name}</if>
             <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="peopleType != null  and peopleType != ''"> and people_type = #{peopleType}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="imageList != null  and imageList != ''"> and image_list = #{imageList}</if>
         </where>
     </select>
 </mapper>

--
Gitblit v1.9.3