|
|
@@ -32,7 +32,7 @@
|
|
|
resultType="com.yh.saas.plugin.yiliangyiyun.entity.FreightInfo">
|
|
|
<if test="searchType != null and searchType != ''">
|
|
|
<if test="searchType == 1">
|
|
|
- SELECT IFNULL(SUM(b.profit)/10000, 0 ) as profit, aa.date as date
|
|
|
+ SELECT IFNULL(SUM(b.profit)/10000, 0 ) as profit, right(aa.date,2) as date
|
|
|
FROM (SELECT @cdate := date_add( @cdate, INTERVAL - 1 DAY ) date
|
|
|
FROM ( SELECT @cdate := date_add( CURDATE(), INTERVAL 1 DAY ) FROM hy_freight_info LIMIT 30 ) a ) aa
|
|
|
LEFT JOIN (select id,profit, profit_date from hy_freight_info
|
|
|
@@ -42,7 +42,7 @@
|
|
|
ORDER BY aa.date DESC;
|
|
|
</if>
|
|
|
<if test="searchType == 2">
|
|
|
- SELECT IFNULL( b.profit, 0 ) as profit , aa.date as date
|
|
|
+ SELECT IFNULL( b.profit, 0 ) as profit , right(aa.date,2) as date
|
|
|
FROM (SELECT DATE_FORMAT( @cdate := date_add( @cdate, INTERVAL - 1 MONTH ), '%Y-%m' ) date
|
|
|
FROM ( SELECT @cdate := date_add( CURDATE(), INTERVAL 1 MONTH ) FROM hy_freight_info ) a LIMIT 12
|
|
|
) aa LEFT JOIN (SELECT SUM(profit)/10000 profit,mon profit_date
|
