From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
index 14241e6..baafcdc 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -355,9 +355,9 @@
SERVICES_ID,
EXC_TIME,
extract,
- a.puse_id,
- a.count,
- a.proj_id
+ puse_id,
+ count,
+ proj_id
</sql>
<sql id="from">
from sys_beautician_state
@@ -614,4 +614,17 @@
group by c.id,f.id) t
</select>
+ <select id="selectByProjUse" resultMap="SysBeauticianStateMap">
+ select * from sys_beautician_state
+ where state!=#{state} and puse_id in
+ <foreach collection="list" index="index" item="item" open="("
+ separator="," close=")">
+ #{item.id}
+ </foreach>
+ </select>
+
+ <select id="selectBeauticianStateByPuseIdAndNoStatus" resultMap="SysBeauticianStateMap">
+ select * from sys_beautician_state
+ where puse_id=#{puseId} and state!=#{state}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1