From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml |   10 ++++++++++
 1 files changed, 10 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 ac6c675..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>

--
Gitblit v1.9.1