Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

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

@@ -120,11 +120,6 @@ public class InspectionFile extends BaseEntity {
      */
     private String questionName;
 
-    /**
-     * 巡检内容
-     */
-    private String questionContent;
-
     /**
      * 详细描述
      */

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

@@ -114,11 +114,6 @@ public class InspectionFileExtend extends BaseEntity {
      */
     private String questionName;
 
-    /**
-     * 巡检内容
-     */
-    private String questionContent;
-
     /**
      * 详细描述
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/handle/QueryInspectionFileHandleByInspectionFileIdService.java

@@ -112,8 +112,7 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
                                         .eq(QuestionType::getCode, inspectionFile.getQuestionCode())
                                         .eq(QuestionType::getMark, 1));
         if (null != questionType) {
-            inspectionFileHandleVo.setQuestionName(questionType.getName());
-            inspectionFileHandleVo.setQuestionContent(questionType.getContent());
+            inspectionFileHandleVo.setQuestionName(questionType.getContent());
         }
         inspectionFileHandleVo.setQuestionCode(inspectionFile.getQuestionCode());
         inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFileDistributionListService.java

@@ -123,8 +123,7 @@ public class QueryInspectionFileDistributionListService {
         for (InspectionFileDistributionListVo inspectionFileDistributionListVo : inspectionFileDistributionListVoList) {
             questionType = questionTypeMap.get(inspectionFileDistributionListVo.getQuestionId());
             if (null != questionType) {
-                inspectionFileDistributionListVo.setQuestionName(questionType.getName());
-                inspectionFileDistributionListVo.setQuestionContent(questionType.getContent());
+                inspectionFileDistributionListVo.setQuestionName(questionType.getContent());
             }
             inspectionFileDistributionListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFileDistributionListVo.getFileThumbnail());
         }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByWorkOrderIdService.java

@@ -157,8 +157,7 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
             questionType = questionTypeMap.get(inspectionFile.getQuestionCode());
             if (null != questionType) {
                 inspectionFileHandleVo.setQuestionCode(questionType.getCode());
-                inspectionFileHandleVo.setQuestionName(questionType.getName());
-                inspectionFileHandleVo.setQuestionContent(questionType.getContent());
+                inspectionFileHandleVo.setQuestionName(questionType.getContent());
             }
 
             if (ObjectUtil.isNotNull(inspectionFileHandleMap)) {

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -166,7 +166,7 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 }
 
                 // 问题名称
-                inspectionFile.setQuestionContent(questionFile.getQuestionName());
+                inspectionFile.setQuestionName(questionFile.getQuestionName());
                 inspectionFile.setTenantId(inspection.getTenantId());
                 inspectionFile.setInspectionId(inspectionId);
                 // 文件类型

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileDistributionListVo.java

@@ -28,12 +28,7 @@ public class InspectionFileDistributionListVo {
     /**
      * 问题名称：1坑槽，2积水，3裂缝
      */
-    private Integer questionName;
-
-    /**
-     * 问题内容
-     */
-    private String questionContent;
+    private String questionName;
 
     /**
      * 缩略图

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileHandleVo.java

@@ -29,12 +29,7 @@ public class InspectionFileHandleVo {
     /**
      * 问题名称：1坑槽，2积水，3裂缝
      */
-    private Integer questionName;
-
-    /**
-     * 问题内容
-     */
-    private String questionContent;
+    private String questionName;
 
     /**
      * 文件名称

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFilePageListByInspectionIdVo.java

@@ -27,11 +27,6 @@ public class InspectionFilePageListByInspectionIdVo {
      */
     private String questionName;
 
-    /**
-     * 问题内容
-     */
-    private String questionContent;
-
     /**
      * 文件名称
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFilePageListVo.java

@@ -30,11 +30,6 @@ public class InspectionFilePageListVo {
      */
     private String questionName;
 
-    /**
-     * 问题内容
-     */
-    private String questionContent;
-
     /**
      * 文件名称
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileReportVo.java

@@ -27,11 +27,6 @@ public class InspectionFileReportVo {
      */
     private Integer questionName;
 
-    /**
-     * 问题内容
-     */
-    private String questionContent;
-
     /**
      * 缩略图
      */

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

@@ -24,7 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="questionContent"    column="question_content"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -56,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="questionContent"    column="question_content"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -90,16 +88,16 @@ 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_code, source, question_name, question_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_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_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
+        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_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.source, tif.question_code, tif.question_name, tif.question_content, tif.question_desc, tif.status,
+        tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.source, tif.question_code, tif.question_name, 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>
@@ -113,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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_code, question_name, question_content, question_desc, `status`, check_user, check_time, create_user, tenant_id)
+        gaode_address, `source`, question_code, question_name, question_desc, `status`, check_user, check_time, create_user, tenant_id)
         values
         <foreach collection="list" item="item" separator=",">
             (
@@ -135,7 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.source,jdbcType=BOOLEAN},
             #{item.questionCode,jdbcType=VARCHAR},
             #{item.questionName,jdbcType=VARCHAR},
-            #{item.questionContent,jdbcType=VARCHAR},
             #{item.questionDesc,jdbcType=VARCHAR},
             #{item.status,jdbcType=TINYINT},
             #{item.checkUser,jdbcType=INTEGER},