From 52d41ba1f8365731cd1d3baffa9d65b4d909d643 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 15 Jan 2021 15:13:34 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
index 84736e1..eb9e0c9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -619,10 +619,11 @@
) a
</select>
- <select id="selectDemo" resultType="com.matrix.system.app.vo.BusinessesDataShowVo">
+ <select id="selectApiBusinessData" resultType="com.matrix.system.app.vo.BusinessesDataShowVo">
<foreach collection="list" index="index" item="item" separator="union all" >
select
- (select sum(amount) from sys_order_flow
+ #{item.beginTime} dataTime,
+ (select IFNULL(sum(amount),0) from sys_order_flow
where <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -631,7 +632,7 @@
and company_id=#{companyId}
</if>
)totalPay,
- (select sum(amount) from sys_order_flow
+ (select IFNULL(sum(amount),0) from sys_order_flow
where pay_method not in ('储值卡', '欠款') and flow_type != '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -640,7 +641,7 @@
and company_id=#{companyId}
</if>
) cashPay,
- (select sum(amount) from sys_order_flow
+ (select IFNULL(sum(amount),0) from sys_order_flow
where pay_method = '储值卡' and flow_type != '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -649,7 +650,7 @@
and company_id=#{companyId}
</if>
) cardPay,
- (select sum(amount) from sys_order_flow
+ (select IFNULL(sum(amount),0) from sys_order_flow
where pay_method = '欠款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -658,7 +659,7 @@
and company_id=#{companyId}
</if>
) arrearsPay,
- (select sum(amount) from sys_order_flow
+ (select IFNULL(sum(amount),0) from sys_order_flow
where pay_method not in ('储值卡', '欠款') and flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -667,7 +668,7 @@
and company_id=#{companyId}
</if>
) refundCashPay,
- (select sum(amount) from sys_order_flow
+ (select IFNULL(sum(amount),0) from sys_order_flow
where pay_method in ('储值卡') and flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -676,7 +677,7 @@
and company_id=#{companyId}
</if>
) refundCardPay,
- (select sum(a.amount) from sys_order_flow a
+ (select IFNULL(sum(amount),0) from sys_order_flow a
inner join sys_order_item b on a.order_id=b.ORDER_ID
inner join shopping_goods c on b.goods_id=c.id
where c.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
@@ -687,7 +688,7 @@
and a.company_id=#{companyId}
</if>
) productAchieve,
- (select sum(a.amount) from sys_order_flow a
+ (select IFNULL(sum(amount),0) from sys_order_flow a
inner join sys_order_item b on a.order_id=b.ORDER_ID
inner join shopping_goods c on b.goods_id=c.id
where c.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
@@ -698,7 +699,7 @@
and a.company_id=#{companyId}
</if>
) cardAchieve,
- (select sum(amount) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
+ (select IFNULL(sum(amount),0) from sys_order_flow where flow_type = '退款' and <![CDATA[ create_time > #{item.beginTime} and create_time < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
</if>
@@ -706,7 +707,7 @@
and company_id=#{companyId}
</if>
) refund,
- (select count(1) from sys_order
+ (select IFNULL(count(1),0) from sys_order
where STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -715,7 +716,7 @@
and company_id=#{companyId}
</if>
) perCustomCnt,
- (select sum(b.COUNT) from sys_order a inner join sys_order_item b on a.ID=b.ORDER_ID
+ (select IFNULL(sum(b.COUNT),0) from sys_order a inner join sys_order_item b on a.ID=b.ORDER_ID
where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -724,7 +725,7 @@
and company_id=#{companyId}
</if>
) totalSaleCnt,
- (select sum(e.count * d.GOODS_PRICE) from sys_order a
+ (select IFNULL(sum(e.count * d.GOODS_PRICE),0) from sys_order a
inner join sys_out_store b on a.id=b.ORDER_ID
inner join sys_out_store_item c on b.id=c.OUT_STORE_ID
inner join sys_store_info d on c.store_id = d.ID
@@ -738,7 +739,7 @@
and a.company_id=#{companyId}
</if>
) goodsCost,
- (select sum(b.COUNT * IFNULL(c.price, 0)) from sys_order a
+ (select IFNULL(sum(b.COUNT * IFNULL(c.price, 0)),0) from sys_order a
inner join sys_order_item b on a.ID=b.ORDER_ID
inner join shopping_goods c on c.good_type != '家居产品' and b.goods_id=c.id
where a.STATU in ('已付款', '欠款') and <![CDATA[ ORDER_TIME > #{item.beginTime} and ORDER_TIME < #{item.endTime} ]]>
@@ -749,7 +750,7 @@
and a.company_id=#{companyId}
</if>
) otherCost,
- (select sum(IFNULL(his_consume, 0)) from achieve_new
+ (select IFNULL(sum(IFNULL(his_consume, 0)),0) from achieve_new
where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -758,7 +759,7 @@
and company_id=#{companyId}
</if>
) consumePay,
- (select sum(IFNULL(free_consume, 0)) from achieve_new
+ (select IFNULL(sum(IFNULL(free_consume, 0)),0) from achieve_new
where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -767,7 +768,7 @@
and company_id=#{companyId}
</if>
) freeConsumePay,
- (select sum(IFNULL(number_of_people, 0)) from achieve_new
+ (select IFNULL(sum(IFNULL(number_of_people, 0)),0) from achieve_new
where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -776,7 +777,7 @@
and company_id=#{companyId}
</if>
) peopleCnt,
- (select sum(IFNULL(proj_num, 0)) from achieve_new
+ (select IFNULL(sum(IFNULL(proj_num, 0)),0) from achieve_new
where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
@@ -785,7 +786,7 @@
and company_id=#{companyId}
</if>
) projConsumeCnt,
- (select sum(IFNULL(proj_time, 0)) from achieve_new
+ (select IFNULL(sum(IFNULL(proj_time, 0)),0) from achieve_new
where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime}]]>
<if test="shopId != null">
and shop_id=#{shopId}
--
Gitblit v1.9.1