气瓶bug修改

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

@@ -99,11 +99,10 @@
             <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.start_time &lt;= #{startTime}  and t.end_time &gt;= #{startTime})
-                or (t.start_time &lt;= #{endTime}  and t.end_time &gt;= #{endTime})
+                and (t.end_time &gt;= #{endTime} 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>
+            <!--<if test="startTime != null "> and t.start_time &gt;= #{startTime}</if>
+            <if test="endTime != null "> and t.end_time &lt;= #{endTime}</if>-->
             <if test="gasUse != null  and gasUse != ''"> and t.gas_use = #{gasUse}</if>
             <if test="applyCertificate != null  and applyCertificate != ''"> and t.apply_certificate = #{applyCertificate}</if>
             <if test="safetyPrecautions != null  and safetyPrecautions != ''"> and t.safety_precautions = #{safetyPrecautions}</if>

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

@@ -70,12 +70,11 @@
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
             <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.start_time &lt;= #{startTime}  and t.end_time &gt;= #{startTime})
-                or (t.start_time &lt;= #{endTime}  and t.end_time &gt;= #{endTime})
+            <if test="startTime != null  and endTime != null">
+                and (t.end_time &gt;= #{endTime} 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>
+            <!--<if test="startTime != null "> and t.start_time &gt;= #{startTime}</if>
+            <if test="endTime != null "> and t.end_time &lt;= #{endTime}</if>-->
             <if test="gasUse != null  and gasUse != ''"> and t.gas_use = #{gasUse}</if>
             <if test="applyCertificate != null  and applyCertificate != ''"> and t.apply_certificate = #{applyCertificate}</if>
             <if test="safetyPrecautions != null  and safetyPrecautions != ''"> and t.safety_precautions = #{safetyPrecautions}</if>