Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/ExportInspectionFileRequest.java

@@ -19,7 +19,7 @@ public class ExportInspectionFileRequest extends BaseQuery {
     private String inspectionId;
 
    /**
-     * 问题编号
+     * 问题ID
      */
     private String questionId;
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFileListByInspectionIdRequest.java

@@ -17,6 +17,11 @@ public class QueryInspectionFileListByInspectionIdRequest {
      */
     private String inspectionId;
 
+    /**
+     * 问题类型编号
+     */
+    private String questionCode;
+
     /**
      * 问题状态：5待确认 10已忽略 15已确认 20已生成工单 25问题已处理
      */

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

@@ -281,6 +281,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.questionCode != null and request.questionCode != ''"> and question_code = #{request.questionCode} </if>
             <choose>
                 <when test="request.status != null and request.status != 0">
                     and status = #{request.status}