From e8e539b6b3c86d6a8ac226449df5b5d16662798a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 18:02:39 +0800
Subject: [PATCH] 1、修改看板查询bug
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 4 ++--
1 files changed, 2 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 48bb959..f28efbf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -966,7 +966,7 @@
b.SHOP_IMAG photo,
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}
@@ -1067,7 +1067,7 @@
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
+ 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}
--
Gitblit v1.9.1