Commit fe249aaa authored by libin's avatar libin

Merge branch 'order_received_statistics' into dev

parents f57f80e9 69acbff8
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
`company_id` , `company_id` ,
`year`, `year`,
`date` `date`
order by `date` desc order by `company_id`,`date` desc
<if test="page!=null and limit!=null"> <if test="page!=null and limit!=null">
limit #{startIndex},#{endInex} limit #{startIndex},#{endInex}
</if> </if>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
company_id, company_id,
`year`, `year`,
`month` `month`
order by `month` desc order by `company_id`, `month` desc
<if test="page!=null and limit!=null"> <if test="page!=null and limit!=null">
limit #{startIndex},#{endInex} limit #{startIndex},#{endInex}
</if> </if>
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
company_id, company_id,
`year`, `year`,
`week_of_year` `week_of_year`
order by `week_of_year` desc order by `company_id`,`week_of_year` desc
<if test="page!=null and limit!=null"> <if test="page!=null and limit!=null">
limit #{startIndex},#{endInex} limit #{startIndex},#{endInex}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment