yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

技师统计时间调整

This commit is contained in:
曹磊 2024-07-11 11:02:22 +08:00
parent 35f8e62782
commit 5ab936a700
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/resources/mapper/artificer/OrdersDao.xml
View File

@ -780,10 +780,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
<if test="isSfwc != null and isSfwc == 0">
and ifnull(o.add_num,0) = 0
@ -814,10 +814,10 @@
and status != 4
)
<if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
<if test="isSfwc != null and isSfwc == 0">
and ifnull(o.add_num,0) = 0
@ -1125,10 +1125,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
union all
@ -1149,10 +1149,10 @@
and status != 4
)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
) t
@ -1172,10 +1172,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
union all
@ -1194,10 +1194,10 @@
and status != 4
)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
) t
@ -1217,10 +1217,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
union all
@ -1239,10 +1239,10 @@
and status != 4
)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
) t
@ -1261,10 +1261,10 @@
and o.status not in (4,11,15)
and o.add_num > 0
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
union all
@ -1284,10 +1284,10 @@
)
and o.add_num > 0
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
and o.status in (3,5)
) t
@ -1314,10 +1314,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
<if test="isSfwc != null and isSfwc == 0">
and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and
@ -1365,10 +1365,10 @@
and status != 4
)
<if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
</if>
<if test="endDate!=null and endDate !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
</if>
<if test="isSfwc != null and isSfwc == 0">
and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and
@ -1500,10 +1500,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
<if test="isSfwc != null and isSfwc == 0">
and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null)
@ -1545,10 +1545,10 @@
and status != 4
)
<if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
<if test="isSfwc != null and isSfwc == 0">
and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null)
@ -1579,10 +1579,10 @@
and o.old_orders_id is not null
and o.status not in (4,11,15)
<if test="startTime!=null and startTime !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
and o.status in (3,5)
union all
@ -1603,10 +1603,10 @@
and status != 4
)
<if test="startTime!=null and startTime !=''">
and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
</if>
<if test="endTime!=null and endTime !=''">
and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
</if>
and o.status in (3,5)
) t