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 | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 558112d..58e7fe4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -41,7 +41,9 @@
<result property="comment" column="comment"/>
<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"/>
<result property="beautiName" column="beautiName"/>
@@ -50,6 +52,7 @@
<result property="createStaffName" column="createStaffName"/>
<result property="bedName" column="bedName"/>
<result property="vipName" column="VIP_Name"/>
+
<association property="vipInfo" resultMap="com.matrix.system.hive.dao.SysVipInfoDao.SysVipInfoMapSimple" ></association>
@@ -95,7 +98,8 @@
company_id,
comment,
reply,
- overtime_notice
+ overtime_notice,
+ cashier_id
)
VALUES (
#{id},
@@ -133,7 +137,8 @@
#{companyId},
#{comment},
#{reply},
- #{overtimeNotice}
+ #{overtimeNotice},
+ #{cashierId}
)
</insert>
@@ -265,6 +270,12 @@
<if test="overtimeNotice != null ">
overtime_notice = #{overtimeNotice},
</if>
+ <if test="cashierId != null ">
+ cashier_id = #{cashierId},
+ </if>
+ <if test="signPic != null ">
+ sign_pic = #{signPic},
+ </if>
</set>
WHERE id=#{id}
</update>
@@ -294,6 +305,7 @@
(select su_name from sys_users f where a.CREATE_STAFF_ID=f.su_id ) as createStaffName,
(select su_name from sys_users j where a.BEAUTICIAN_ID=j.su_id ) as beautiName,
(select su_name from sys_users k where a.devision_id=k.su_id ) as plsName,
+ (select su_name from sys_users l where a.cashier_id=l.su_id ) as cashierName,
(select shop_name from sys_shop_info h where a.SHOP_ID=h.ID ) as shopName,
(select bed_name from sys_bed_info i where a.BED_ID=i.ID ) as bedName
FROM sys_proj_services a
@@ -301,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>
@@ -325,6 +340,9 @@
</if>
<if test="record.state != null and record.state !='' ">
and a.STATE = #{record.state}
+ </if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
</if>
<if test="record.shopId != null and record.shopId !='' ">
AND a.SHOP_ID = #{record.shopId}
@@ -365,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>
@@ -387,6 +408,9 @@
and a.STATE = #{record.state}
</if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
+ </if>
<if test="(record.companyId!=null and record.companyId!='') ">
and a.company_id = #{record.companyId}
</if>
@@ -423,6 +447,7 @@
(select su_name from sys_users f where a.CREATE_STAFF_ID=f.su_id ) as createStaffName,
(select su_name from sys_users j where a.BEAUTICIAN_ID=j.su_id ) as beautiName,
(select su_name from sys_users k where a.devision_id=k.su_id ) as plsName,
+ (select su_name from sys_users l where a.cashier_id=l.su_id ) as cashierName,
(select shop_name from sys_shop_info h where a.SHOP_ID=h.ID ) as shopName,
(select bed_name from sys_bed_info i where a.BED_ID=i.ID ) as bedName
FROM sys_proj_services a
@@ -455,6 +480,7 @@
(select su_name from sys_users f where a.CREATE_STAFF_ID=f.su_id ) as createStaffName,
(select su_name from sys_users j where a.BEAUTICIAN_ID=j.su_id ) as beautiName,
(select su_name from sys_users k where a.devision_id=k.su_id ) as plsName,
+ (select su_name from sys_users l where a.cashier_id=l.su_id ) as cashierName,
(select shop_name from sys_shop_info h where a.SHOP_ID=h.ID ) as shopName,
(select bed_name from sys_bed_info i where a.BED_ID=i.ID ) as bedName
FROM sys_proj_services a
@@ -482,6 +508,9 @@
</if>
<if test="record.state != null and record.state !='' ">
and a.STATE = #{record.state}
+ </if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
</if>
<if test="record.shopId != null and record.shopId !='' ">
AND a.SHOP_ID = #{record.shopId}
@@ -647,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