From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index d1c42c5..58e7fe4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -311,7 +311,7 @@
FROM sys_proj_services a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left join sys_beautician_state c on a.id=c.SERVICES_ID
- WHERE 1 = 1 and (b.IS_DELETE is null or b.IS_DELETE = '')
+ WHERE 1 = 1
<if test="record!=null">
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(c.vip_name, #{record.queryKey}) or instr(c.phone, #{record.queryKey}) or instr(a.order_no, #{record.queryKey}))
@@ -381,7 +381,7 @@
FROM sys_proj_services a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left join sys_beautician_state c on a.id=c.SERVICES_ID
- WHERE 1 = 1 and (b.IS_DELETE is null or b.IS_DELETE = '')
+ WHERE 1 = 1
<if test="record!=null">
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(c.vip_name, #{record.queryKey}) or instr(c.phone, #{record.queryKey}) or instr(a.order_no, #{record.queryKey}))
@@ -453,7 +453,7 @@
FROM sys_proj_services a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left join sys_beautician_state c on a.id=c.SERVICES_ID
- where a.ID=#{id} and (b.IS_DELETE is null or b.IS_DELETE = '')
+ where a.ID=#{id}
</select>
<select id="selectNeedNoticeService" resultMap="SysProjServicesMap">
@@ -465,7 +465,7 @@
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
where a.YY_TIME > now()
and DATE_ADD(now(),INTERVAL 1 HOUR) > a.YY_TIME
- and overtime_notice is null and (b.IS_DELETE is null or b.IS_DELETE = '')
+ and overtime_notice is null
</select>
@@ -486,7 +486,7 @@
FROM sys_proj_services a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left join sys_beautician_state c on a.id=c.SERVICES_ID
- WHERE 1 = 1 and (b.IS_DELETE is null or b.IS_DELETE = '')
+ WHERE 1 = 1
<if test="record!=null">
<if test="record.queryStaffId != null and record.queryStaffId !='' ">
and (a.CREATE_STAFF_ID = #{record.queryStaffId} or c.STAFF_ID=#{record.queryStaffId} )
@@ -580,7 +580,7 @@
left join sys_proj_use g on b.puse_id=g.ID
left join sys_shop_info h on a.SHOP_ID=h.ID
<where>
- and a.company_id=#{record.companyId} and (e.IS_DELETE is null or e.IS_DELETE = '')
+ and a.company_id=#{record.companyId}
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
</if>
@@ -617,7 +617,7 @@
left join sys_users f on f.su_id=b.STAFF_ID
left join sys_proj_use g on b.puse_id=g.ID
<where>
- and a.company_id=#{record.companyId} and (e.IS_DELETE is null or e.IS_DELETE = '')
+ and a.company_id=#{record.companyId}
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
</if>
@@ -676,7 +676,7 @@
left join sys_shop_info h on a.SHOP_ID=h.ID
left join shopping_goods m on g.proj_id=m.id
<where>
- and (e.IS_DELETE is null or e.IS_DELETE = '')
+
<if test="queryKey != null and queryKey != ''">
and instr(a.SERVICE_NO, #{queryKey})
</if>
@@ -728,7 +728,7 @@
left join sys_proj_use g on b.puse_id=g.ID
left join sys_shop_info h on a.SHOP_ID=h.ID
left join shopping_goods m on g.proj_id=m.id
- where a.id=#{id} and (e.IS_DELETE is null or e.IS_DELETE = '')
+ where a.id=#{id}
</select>
--
Gitblit v1.9.1