From 40d86303ae43c62c57dc7a60ace4ed40cc72ed5c Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 08 Jun 2021 20:35:45 +0800
Subject: [PATCH] 业绩规则3
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 7 +++----
1 files changed, 3 insertions(+), 4 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 fae293f..651ca07 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -95,6 +95,7 @@
left join sys_proj_services l on a.service_order_id=l.id
left join sys_order_item j on a.order_item_id=j.ID
<where>
+ and a.company_id = #{record.companyId}
<if test="record!=null">
<if
test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
@@ -118,9 +119,7 @@
<if test="record.beaultId != null and record.beaultId !='' ">
and a.beault_id = #{record.beaultId}
</if>
- <if test="record.companyId != null and record.companyId !='' ">
- and a.company_id = #{record.companyId}
- </if>
+
<if test="record.beaultId != null and record.beaultId !='' ">
and a.beault_id = #{record.beaultId}
</if>
@@ -1181,7 +1180,7 @@
</if>
</where>
- GROUP BY g.su_id , f.su_id, a.order_type, h.id,a.achieveType
+ GROUP BY g.su_id , f.su_id, a.order_type, h.id,a.achieveType,u.name
<if test="record.sort !=null and record.sort!=''"> order by ${record.sort} ${record.order}</if>
</select>
--
Gitblit v1.9.1