From 5011c035b9902637b1cb4d08112e00239ff99381 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 23 May 2022 12:05:36 +0800
Subject: [PATCH] 合并master
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index bbf480c..4b6fcb8 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -817,6 +817,10 @@
<if test="record.phone != null and record.phone !='' ">
and a.PHONE like CONCAT('%',#{record.phone},'%')
</if>
+ <if test="record.padQueryKey != null and record.padQueryKey !='' ">
+ and (a.PHONE like CONCAT('%',#{record.padQueryKey},'%')
+ or instr(a.VIP_NAME ,#{record.padQueryKey}) )
+ </if>
<if test="record.sex != null and record.sex !='' ">
and a.SEX = #{record.sex}
</if>
@@ -1386,7 +1390,7 @@
select x.vip_id, count(1) arriveCnt from (
select vip_id, date_format(datatime, '%Y-%m-%d')
from achieve_new
- where 1=1 and (a.IS_DELETE is null or a.IS_DELETE = '')
+ where 1=1
<!-- 本月到店次数 -->
<if test="record.sort == 'monthArrived'">
and date_format(curdate(), '%Y-%m') = date_format(datatime, '%Y-%m')
@@ -1425,7 +1429,7 @@
</if>
left join sys_shop_info g on a.shop_id = g.id
left join sys_vip_level h on a.level_id=h.id
- where 1=1
+ where 1=1 and (a.IS_DELETE is null or a.IS_DELETE = '')
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(PHONE,#{record.queryKey})
or instr(VIP_NAME ,#{record.queryKey})
--
Gitblit v1.9.1