|
@@ -354,10 +354,10 @@
|
|
|
AND FIND_IN_SET(spo.organ_id_,#{organId})
|
|
|
</if>
|
|
|
<if test="orderStartDate != null">
|
|
|
- AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') >= #{orderStartDate}
|
|
|
+ AND spo.create_time_ >= CONCAT(#{orderStartDate},' 00:00:00')
|
|
|
</if>
|
|
|
<if test="orderEndDate != null">
|
|
|
- AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') <= #{orderEndDate}
|
|
|
+ AND spo.create_time_ <= CONCAT(#{orderEndDate},' 23:59:59')
|
|
|
</if>
|
|
|
<if test="notGroupType != null and notGroupType != ''">
|
|
|
AND spo.group_type_ != #{notGroupType}
|
|
@@ -423,13 +423,13 @@
|
|
|
AND FIND_IN_SET(spo.organ_id_,#{organId})
|
|
|
</if>
|
|
|
<if test="orderStartDate != null">
|
|
|
- AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') >= #{orderStartDate}
|
|
|
+ AND spo.create_time_ >= CONCAT(#{orderStartDate},' 00:00:00')
|
|
|
</if>
|
|
|
<if test="orderEndDate != null">
|
|
|
- AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') <= #{orderEndDate}
|
|
|
+ AND spo.create_time_ <= CONCAT(#{orderEndDate},' 23:59:59')
|
|
|
</if>
|
|
|
<if test="month != null and month != ''">
|
|
|
- AND DATE_FORMAT(spo.create_time_,'%Y-%m') = #{month} AND spo.status_ = 'SUCCESS'
|
|
|
+ AND spo.create_time_ BETWEEN CONCAT(#{month},'-01 00:00:00') AND CONCAT(#{month},'-31 23:59:59') AND spo.status_ = 'SUCCESS'
|
|
|
</if>
|
|
|
<if test="notGroupType != null and notGroupType != ''">
|
|
|
AND spo.group_type_ != #{notGroupType}
|