Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and status = #{request.status}
                 </when>
                 <otherwise>
-                    and status in (15, 20, 25)
+                    and status in (5, 10, 15, 20, 25)
                 </otherwise>
             </choose>
         </where>
@@ -197,16 +197,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="1 == 1"> and tif.mark = 1 </if>
             <if test="request.key != null and request.key != ''"> and (ti.code like concat('%', #{request.key}, '%') or ti.name like concat('%', #{request.key}, '%')) </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">
-                        and tif.status = #{request.status}
-                    </when>
-                    <otherwise>
-                        and tif.status in (15, 20, 25)
-                    </otherwise>
-                </choose>
-            </if>
+            <choose>
+                <when test="request.status != null and request.status != 0">
+                    and tif.status = #{request.status}
+                </when>
+                <otherwise>
+                    and tif.status in (15, 20, 25)
+                </otherwise>
+            </choose>
             <if test="request.deptIdList != null and request.deptIdList.size() > 0">
                 and ti.dept_id in
                 <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">