From b8b9ba738ce614820a46c6700e5400984c4e5b58 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 18 Jan 2021 00:21:59 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java |    2 +-
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml                        |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
index 3c879dd..ade0b0b 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
@@ -47,7 +47,7 @@
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         if ("dev".equals(evn)) {
-            SysUsers sysUsers = sysUsersDao.selectById(1073L);
+            SysUsers sysUsers = sysUsersDao.selectById(1074L);
             request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
             return true;
         }
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 882b4f1..d6f90e1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -941,13 +941,13 @@
 		select
 			sale_id id,
 			sum(case t3 when '现金业绩' then card_cash else 0 end) orderCash,
-			sum(case t3 when '划扣业绩' then card_cash else 0 end) cash,
-			sum(IFNULL(proj_percentage, 0)) cardUse,
+			sum(case t3 when '划扣业绩' then consume else 0 end) cash,
+			sum(case order_type when '订单' then proj_percentage else 0 end) cardUse,
 			sum(IFNULL(his_consume, 0)) hisConsume,
 			sum(IFNULL(free_consume, 0)) freeConsume,
-			sum(IFNULL(proj_percentage, 0)) projCommission
+			sum(case order_type when '服务单' then proj_percentage else 0 end) projCommission
 		from achieve_new a
-		where a.beault_id=#{userId} and a.order_type = '订单'
+		where a.beault_id=#{userId}
 		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>
 

--
Gitblit v1.9.1