Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectListByInspectIdList" resultType="list" resultMap="InspectionFileResult">
         select <include refid="Base_Column_List"/>
         from th_inspection_file
-        where mark = 1 and status in(20,25) and
+        where mark = 1 and status in(15, 20, 25) and
         inspection_id in
         <foreach collection="list" item="inspectionId" separator="," open="(" close=")">
             #{inspectionId}
@@ -177,7 +177,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
-            <if test="request.status != null and request.status != 0"> and status = #{request.status} </if>
+            <choose>
+                <when test="request.status != null and request.status != 0">
+                    and status = #{request.status}
+                </when>
+                <otherwise>
+                    and status in (15, 20, 25)
+                </otherwise>
+            </choose>
         </where>
         order by create_time desc
     </select>