|
|
@@ -271,7 +271,7 @@
|
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
|
where wo.del_flag = 0
|
|
|
and lo.del_flag = 0
|
|
|
- and wo.status in (7, 8, 9, 10, 11, 12, 13)
|
|
|
+ and wo.status in (7, 8, 9, 10, 12, 13)
|
|
|
and wo.driver_id = #{driverId, jdbcType=BIGINT}) tabE on tabE.indexNum = tabA.indexNum
|
|
|
</select>
|
|
|
|
|
|
@@ -284,7 +284,7 @@
|
|
|
LEFT JOIN kwt_logistics_order lo on lo.id = wo.l_order_id
|
|
|
where wo.del_flag = 0 and lo.del_flag = 0
|
|
|
<if test="busStatus != null and busStatus == 4">
|
|
|
- and wo.status in (7, 8, 9, 10, 11, 12, 13)
|
|
|
+ and wo.status in (7, 8, 9, 10, 12, 13)
|
|
|
</if>
|
|
|
<if test="driverId != null and driverId != ''">
|
|
|
and wo.driver_id = #{driverId, jdbcType=BIGINT}
|
|
|
@@ -292,10 +292,10 @@
|
|
|
<if test="month != null and month != ''">
|
|
|
and LEFT(wo.create_time, 7) = #{month, jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="month != null and month != ''">
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
and DATE(wo.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="month != null and month != ''">
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
and DATE(wo.create_time) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
</select>
|
|
|
@@ -414,10 +414,10 @@
|
|
|
<if test="month != null and month != ''">
|
|
|
and LEFT(wo.create_time, 7) = #{month, jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="month != null and month != ''">
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
and DATE(wo.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="month != null and month != ''">
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
and DATE(wo.create_time) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
</select>
|