修改问题类型字段

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/InspectionFileDistribution.java

@@ -66,7 +66,7 @@ public class InspectionFileDistribution extends BaseEntity {
     /**
      * 问题类型二级分类ID
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题名称

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/InspectionFileExtend.java

@@ -102,7 +102,7 @@ public class InspectionFileExtend extends BaseEntity {
     /**
      * 问题类型二级分类ID
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 图片来源：1AI 2后台 3视频
@@ -117,7 +117,7 @@ public class InspectionFileExtend extends BaseEntity {
     /**
      * 巡检内容
      */
-    private String content;
+    private String questionContent;
 
     /**
      * 详细描述

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionFileMapper.xml

@@ -21,10 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="content"    column="content"    />
+        <result property="questionContent"    column="question_content"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -53,10 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="content"    column="content"    />
+        <result property="questionContent"    column="question_ccontent"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="questionName"    column="question_name"    />
         <result property="status"    column="status"    />
         <result property="inspectionCode"    column="inspection_code"    />
@@ -90,34 +90,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_id, source, question_name, content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark
+        id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_code, source, question_name, question_content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark
     </sql>
 
     <sql id="selectThInspectionFileVo">
-        select id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_id, source, question_name, content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark from th_inspection_file
+        select id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_code, source, question_name, question_content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark from th_inspection_file
     </sql>
 
     <sql id="Base_Extend_Column_List">
         tif.id, tif.tenant_id, tif.file_code, tif.inspection_id, tif.file_type, tif.file_name, tif.file_thumbnail, tif.file_original, tif.file_image, tif.file_size,
-        tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_id, tif.source, tif.question_name, tif.content, tif.question_desc, tif.status,
+        tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_code, tif.source, tif.question_name, tif.question_content, tif.question_desc, tif.status,
         tif.check_user, tif.check_time, tif.create_user, tif.create_time, tif.update_user, tif.update_time, tif.mark,
         ti.code as inspection_code, ti.name as inspection_name, ti.road_id, ti.dept_id
     </sql>
 
     <sql id="Base_Distribution_Column_List">
-        tif.id, tif.tenant_id, tif.file_thumbnail, tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_id, tif.question_name, tif.status,
+        tif.id, tif.tenant_id, tif.file_thumbnail, tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_code, tif.question_name, tif.status,
         ti.code as inspection_code, ti.name as inspection_name
     </sql>
 
     <!-- 批量新增问题图片 -->
     <insert id="addBatch" parameterType="com.tuoheng.admin.entity.InspectionFile">
         insert into th_inspection_file (id,file_code, inspection_id, file_type, file_name,
-        file_thumbnail, file_original, file_image,
-        file_size, latitude, longitude,
-        `location`, gaode_longitude, gaode_latitude,
-        gaode_address, `source`, question_id, question_name, content,
-        question_desc, `status`, check_user,
-        check_time, create_user, tenant_id)
+        file_thumbnail, file_original, file_image, file_size, latitude, longitude, `location`, gaode_longitude, gaode_latitude,
+        gaode_address, `source`, question_code, question_name, question_content, question_desc, `status`, check_user, check_time, create_user, tenant_id)
         values
         <foreach collection="list" item="item" separator=",">
             (
@@ -137,9 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.gaodeLatitude,jdbcType=VARCHAR},
             #{item.gaodeAddress,jdbcType=VARCHAR},
             #{item.source,jdbcType=BOOLEAN},
-            #{item.questionId,jdbcType=VARCHAR},
+            #{item.questionCode,jdbcType=VARCHAR},
             #{item.questionName,jdbcType=VARCHAR},
-            #{item.content,jdbcType=VARCHAR},
+            #{item.questionContent,jdbcType=VARCHAR},
             #{item.questionDesc,jdbcType=VARCHAR},
             #{item.status,jdbcType=TINYINT},
             #{item.checkUser,jdbcType=INTEGER},
@@ -182,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and mark = 1 </if>
             <if test="request.inspectionId != null and request.inspectionId != ''"> and inspection_id = #{request.inspectionId} </if>
-            <if test="request.questionId != null and request.questionId != ''"> and question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and question_Code = #{request.questionCode} </if>
             <if test="request.status != null and request.status != 0"> and status = #{request.status} </if>
         </where>
         order by create_time desc
@@ -195,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and tif.mark = 1 </if>
             <if test="request.key != null and request.key != 0"> and (ti.code like concat('%', #{request.key}, '%') or ti.name like concat('%', #{request.key}, '%')) </if>
-            <if test="request.questionId != null and request.questionId != ''"> and tif.question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and tif.question_Code = #{request.questionCode} </if>
             <if test="request.status != null">
                 <choose>
                     <when test="request.status != 0">
@@ -229,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and tif.mark = 1 </if>
             <if test="request.inspectionName != null and request.inspectionName != ''"> and ti.name like concat('%', #{request.inspectionName}, '%') </if>
-            <if test="request.questionId != null and request.questionId != ''"> and tif.question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and tif.question_code = #{request.questionCode} </if>
             <if test="request.status != null">
                 <choose>
                     <when test="request.status != 0">