From c423224dbe37ea69c1a36c696f85490343e68c4c Mon Sep 17 00:00:00 2001 From: 姜友瑶 <935090232@qq.com> Date: Tue, 09 Aug 2022 09:11:51 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 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 902cbc7..30b5c74 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml @@ -446,6 +446,30 @@ where a.ID=#{id} </select> + <!-- 根据id查询--> + <select id="selectByIds" resultMap="SysProjServicesMap"> + select distinct + a.*, + b.PHONE , + b.VIP_Name , + b.VIP_NO, + (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 + LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID + left join sys_beautician_state c on a.id=c.SERVICES_ID + where a.ID in + <foreach collection="list" index="index" item="item" open="(" + separator="," close=")"> + #{item} + </foreach> + </select> + + <select id="selectNeedNoticeService" resultMap="SysProjServicesMap"> select a.id, @@ -666,6 +690,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