|
@@ -80,7 +80,7 @@
|
|
|
b.order_status = 2
|
|
|
<choose>
|
|
|
<when test="groupNumFrom.dataFrom !=null and groupNumFrom.dataFrom !=''">
|
|
|
- AND DATE_FORMAT(b.create_time, '%Y') = DATE_FORMAT(#{groupNumFrom.dataFrom}, '%Y')
|
|
|
+ AND DATE_FORMAT(b.create_time, '%Y') = #{groupNumFrom.dataFrom}
|
|
|
</when>
|
|
|
<otherwise>
|
|
|
AND DATE_FORMAT(b.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
|