From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 902cbc7..58e7fe4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -42,6 +42,7 @@
<result property="reply" column="reply"/>
<result property="overtimeNotice" column="overtime_notice"/>
<result property="cashierId" column="cashier_id"/>
+ <result property="signPic" column="sign_pic"/>
<result property="cashierName" column="cashierName"/>
@@ -272,6 +273,9 @@
<if test="cashierId != null ">
cashier_id = #{cashierId},
</if>
+ <if test="signPic != null ">
+ sign_pic = #{signPic},
+ </if>
</set>
WHERE id=#{id}
</update>
@@ -309,6 +313,9 @@
left join sys_beautician_state c on a.id=c.SERVICES_ID
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}))
+ </if>
<if test="record.queryStaffId != null and record.queryStaffId !='' ">
and (a.CREATE_STAFF_ID = #{record.queryStaffId} or c.STAFF_ID=#{record.queryStaffId} )
</if>
@@ -376,6 +383,9 @@
left join sys_beautician_state c on a.id=c.SERVICES_ID
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}))
+ </if>
<if test="record.queryStaffId != null and record.queryStaffId !='' ">
and (a.CREATE_STAFF_ID = #{record.queryStaffId} or c.STAFF_ID=#{record.queryStaffId} )
</if>
@@ -666,6 +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>
+
<if test="queryKey != null and queryKey != ''">
and instr(a.SERVICE_NO, #{queryKey})
</if>
--
Gitblit v1.9.1