From 2e3c12ca3a7241f498c32121cb1572502c998d0d Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 09 Jan 2021 00:42:00 +0800
Subject: [PATCH] 公众号模板消息demo

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml |   16 ++++++++++++++++
 1 files changed, 16 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 6d8c7e1..d2b2a8b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -466,9 +466,11 @@
 		<result property="vipName" column="vipName" />
 		<result property="timeLength" column="timeLength" />
 		<result property="status" column="status" />
+		<result property="createStaffId" column="createStaffId" />
 		<collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
 			<result property="projName" column="projName" />
 			<result property="beautyName" column="beautyName" />
+			<result property="id" column="staffId" />
 		</collection>
 	</resultMap>
 
@@ -480,8 +482,10 @@
 		   a.YY_TIME time,
 		   a.TOTAL_TIME timeLength,
 		   a.state status,
+		   a.create_staff_id createStaffId,
 		   d.BED_NAME bed,
 		   e.VIP_NAME vipName,
+		   b.staff_id staffId,
 		   f.su_name beautyName,
 		   g.proj_name projName
 		from sys_proj_services a
@@ -497,6 +501,12 @@
 			</if>
 			<if test="record.status != null and record.status != ''">
 				and a.state = #{record.status}
+			</if>
+			<if test="record.shopId != null">
+				and a.shop_id=#{record.shopId}
+			</if>
+			<if test="record.userId!=null">
+				and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
 			</if>
 		</where>
 		<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -524,6 +534,12 @@
 			<if test="record.status != null and record.status != ''">
 				and a.state = #{record.status}
 			</if>
+			<if test="record.shopId != null">
+				and a.shop_id=#{record.shopId}
+			</if>
+			<if test="record.userId!=null">
+				and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
+			</if>
 		</where>
 	</select>
 </mapper>

--
Gitblit v1.9.1