From 020911ea0df033a9c5b921d1c4938b37d9cd6fe4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:23:01 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 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 a3a562c..1994fd2 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -873,12 +873,17 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
- <if test="record.beginTime != null and record.endTime!=null">
- and date_format(b.datatime, '%Y-%m-%d') between #{record.beginTime} and #{record.endTime}
+ <if test="record.beginTime != null">
+ and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.beginTime}, '%Y-%m-%d')
</if>
-
+ <if test="record.endTime!=null">
+ and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.endTime}, '%Y-%m-%d')
+ </if>
<if test="record.beaultId != null and record.beaultId!=''">
and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
+ </if>
+ <if test='record.t1 == "on"'>
+ and a.BEATUY_ID is not null
</if>
group by a.PHONE
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -915,26 +920,42 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
- <if test="record.beginTime != null and record.endTime!=null">
- and date_format(b.datatime, '%Y-%m-%d') between #{record.beginTime} and #{record.endTime}
+ <if test="record.beginTime != null">
+ and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.beginTime}, '%Y-%m-%d')
</if>
-
+ <if test="record.endTime!=null">
+ and date_format(b.datatime, '%Y-%m-%d') >= date_format(#{record.endTime}, '%Y-%m-%d')
+ </if>
<if test="record.beaultId != null and record.beaultId!=''">
and FIND_IN_SET(#{record.beaultId}, a.BEATUY_ID)
+ </if>
+ <if test='record.t1 == "on"'>
+ and a.BEATUY_ID is not null
</if>
</select>
- <select id="selectUserAchieveByTime" resultType="com.matrix.system.api.vo.UserAchieveVo">
+ <select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
select
- sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0)) allCash,
- sum(card_cash) card,
- sum(proj_cash) project,
- sum(goods_cash) product,
- sum(consume) cardUse,
- sum(proj_percentage) projCommission
- from achieve_new
+ sale_id id,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(consume, 0) + IFNULL(b.arrears, 0)) orderCash,
+ sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0) + IFNULL(b.arrears, 0)) cash,
+ sum(IFNULL(consume, 0)) cardUse,
+ sum(IFNULL(his_consume, 0)) hisConsume,
+ sum(IFNULL(free_consume, 0)) freeConsume,
+ sum(IFNULL(proj_percentage, 0)) projCommission
+ from achieve_new a
+ left join sys_order b on a.sale_id=b.STAFF_ID and (date_format(b.ORDER_TIME, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(b.ORDER_TIME, '%Y-%m-%d'))
where sale_id=#{userId}
- and (date_format(datatime, "%Y-%m-%d") >= #{startTime} or #{endTime} >= date_format(datatime, "%Y-%m-%d"))
+ and (date_format(datatime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') >= date_format(datatime, '%Y-%m-%d'))
+ </select>
+
+ <select id="selectApiOrderItemAchieve" resultType="com.matrix.system.app.vo.OrderDetailAchieveItemVo">
+ select
+ b.su_name name,
+ IFNULL(a.card_cash, 0) + IFNULL(a.proj_cash, 0) + IFNULL(a.goods_cash, 0) achieve
+ from achieve_new a
+ inner join sys_users b on (a.beault_id=b.su_id or a.sale_id = b.su_id)
+ where a.order_item_id=#{itemId} and order_type = '订单'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1