From aa11f5dc00d905769cd34a3cad84a074957148ed Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 14 Jan 2021 23:28:40 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 18 ++++++++++++++++++
1 files changed, 18 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..736e68d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -464,11 +464,14 @@
<result property="time" column="time"/>
<result property="bed" column="bed" />
<result property="vipName" column="vipName" />
+ <result property="vipId" column="vipId" />
<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 +483,11 @@
a.YY_TIME time,
a.TOTAL_TIME timeLength,
a.state status,
+ a.create_staff_id createStaffId,
d.BED_NAME bed,
e.VIP_NAME vipName,
+ e.id vipId,
+ b.staff_id staffId,
f.su_name beautyName,
g.proj_name projName
from sys_proj_services a
@@ -497,6 +503,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 +536,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