|
|
@@ -76,7 +76,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getSaleFutureData" parameterType="long" resultType="string">
|
|
|
- select concat('[',d1,',',d2,',',d3,',',d4,',',d5,',',d6,']') from (
|
|
|
+ select concat('[',d6,',',d5,',',d4,',',d3,',',d2,',',d1,']') from (
|
|
|
(select concat('{"x":',DATE_FORMAT(now(),'%c'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d1 from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc) data_1,
|
|
|
|
|
|
(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%c'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d2 from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc)data_2,
|
guq