From 020911ea0df033a9c5b921d1c4938b37d9cd6fe4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:23:01 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 8 ++++++++
1 files changed, 8 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..1df9bcf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -469,6 +469,7 @@
<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>
@@ -482,6 +483,7 @@
a.state status,
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 +499,9 @@
</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>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -524,6 +529,9 @@
<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>
</where>
</select>
</mapper>
--
Gitblit v1.9.1