气瓶bug修改

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationApplyMapper.xml

@@ -99,7 +99,11 @@
             <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="phone != null  and phone != ''"> and t.phone = #{phone}</if>
             <if test="startTime != null  and endTime != null">
-                and (t.end_time &gt;= #{endTime} or (t.start_time BETWEEN #{startTime}  and #{endTime}) )
+                and (
+                #{startTime} BETWEEN  t.start_time and  t.end_time
+                or #{endTime} BETWEEN  t.start_time and  t.end_time
+                or t.start_time BETWEEN  #{startTime} and #{endTime}
+                )
             </if>
             <!--<if test="startTime != null "> and t.start_time &gt;= #{startTime}</if>
             <if test="endTime != null "> and t.end_time &lt;= #{endTime}</if>-->

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUsegasApplyMapper.xml

@@ -71,7 +71,11 @@
             <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="phone != null  and phone != ''"> and t.phone = #{phone}</if>
             <if test="startTime != null  and endTime != null">
-                and (t.end_time &gt;= #{endTime} or (t.start_time BETWEEN #{startTime}  and #{endTime}) )
+                and (
+                #{startTime} BETWEEN  t.start_time and  t.end_time
+                or #{endTime} BETWEEN  t.start_time and  t.end_time
+                or t.start_time BETWEEN  #{startTime} and #{endTime}
+                )
             </if>
             <!--<if test="startTime != null "> and t.start_time &gt;= #{startTime}</if>
             <if test="endTime != null "> and t.end_time &lt;= #{endTime}</if>-->