任务池导出修改

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -2435,13 +2435,8 @@
                 and u.leader_name = #{orderQueryVo.leaderName}
             </if>
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
-                and ((
-                DATE_FORMAT(iac.jq_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr}
-                AND #{orderQueryVo.attachEndDateStr}
-                )
-                OR ( DATE_FORMAT(iac.sy_start_date, '%Y-%m-%d') BETWEEN #{orderQueryVo.attachStartDateStr} AND
-                #{orderQueryVo.attachEndDateStr} )
-                )
+                and ((iac.jq_start_date >= #{orderQueryVo.attachStartDateStr} AND iac.jq_start_date &lt; DATE_ADD( #{orderQueryVo.attachEndDateStr}, INTERVAL 1 DAY))
+                OR (iac.sy_start_date >= #{orderQueryVo.attachStartDateStr} AND iac.sy_start_date &lt; DATE_ADD( #{orderQueryVo.attachEndDateStr}, INTERVAL 1 DAY)))
             </if>
             <choose>
                 <when test="type==1">
@@ -2452,24 +2447,20 @@
                 </when>
             </choose>
             <if test="orderQueryVo.signStartDateStr != null and orderQueryVo.signEndDateStr != null">
-                and DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{orderQueryVo.signStartDateStr} AND
-                #{orderQueryVo.signEndDateStr}
+                AND iac.signing_time >= #{orderQueryVo.signStartDateStr} AND iac.signing_time &lt; DATE_ADD( #{orderQueryVo.signEndDateStr}, INTERVAL 1 DAY)
             </if>
             <if test="orderQueryVo.entryStatus != null and orderQueryVo.entryStatus != ''">
                 and io.entry_status = #{orderQueryVo.entryStatus }
             </if>
             <if test="orderQueryVo.payStartDateStr != null and orderQueryVo.payEndDateStr != null">
-                and DATE_FORMAT(iac.pay_date, '%Y-%m-%d') between #{orderQueryVo.payStartDateStr} AND
-                #{orderQueryVo.payEndDateStr}
+                AND iac.pay_date >= #{orderQueryVo.payStartDateStr} AND iac.pay_date &lt; DATE_ADD( #{orderQueryVo.payEndDateStr}, INTERVAL 1 DAY)
             </if>
 
             <if test="orderQueryVo.auditStartDateStr != null and orderQueryVo.auditEndDateStr != null">
-                and DATE_FORMAT(iac.underwriting_time, '%Y-%m-%d') between #{orderQueryVo.auditStartDateStr} AND
-                #{orderQueryVo.auditEndDateStr}
+                AND iac.underwriting_time >= #{orderQueryVo.auditStartDateStr} AND iac.underwriting_time &lt; DATE_ADD( #{orderQueryVo.auditEndDateStr}, INTERVAL 1 DAY)
             </if>
             <if test="orderQueryVo.updateStartDateStr != null and orderQueryVo.updateEndDateStr != null">
-                and DATE_FORMAT( iac.update_status_time, '%Y-%m-%d') between #{orderQueryVo.updateStartDateStr} AND
-                #{orderQueryVo.updateEndDateStr}
+                AND iac.update_status_time >= #{orderQueryVo.updateStartDateStr} AND iac.update_status_time &lt; DATE_ADD( #{orderQueryVo.updateEndDateStr}, INTERVAL 1 DAY)
             </if>
             <if test="orderQueryVo.updateStatus != null and orderQueryVo.updateStatus != null">
                 and iac.update_status = #{orderQueryVo.updateStatus}