From be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index d6f90e1..f28efbf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -964,9 +964,9 @@
select
b.shop_short_name name,
b.SHOP_IMAG photo,
- sum(IFNULL(a.free_consume,0) + IFNULL(a.consume,0) + IFNULL(a.his_consume,0)) amount
+ sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume,0)) amount
from achieve_new a
- left join sys_shop_info b on a.shop_id=b.ID
+ left join sys_shop_info b on a.shop_id=b.ID and b.shop_type!=1
<where>
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
@@ -1060,4 +1060,29 @@
group by b.su_id
order by amount desc, b.su_id
</select>
+
+ <select id="selectShopSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
+ select
+ b.shop_short_name name,
+ b.SHOP_IMAG photo,
+ sum(IFNULL(a.consume,0) + IFNULL(a.card_cash,0)) amount
+ from achieve_new a
+ left join sys_shop_info b on a.shop_id=b.ID and shop_type!=1
+ <where>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
+ </if>
+ <if test='record.t1 == "1" and record.datatime != null'>
+ and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
+ </if>
+ <if test='record.t1 == "2" and record.datatime != null'>
+ and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
+ </if>
+ <if test='record.t1 == "3" and record.datatime != null'>
+ and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
+ </if>
+ </where>
+ group by a.shop_id
+ order by amount desc, a.shop_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1