From 324f4985b816a15d58492ff85627480abf29eec7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jan 2021 10:51:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 53956bf..a6fd1d8 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -327,6 +327,8 @@
<![CDATA[ a.BEGIN_TIME > #{beginTime}
and a.END_TIME < #{endTime}
and a.STAFF_ID = #{suId} ]]>
+ and a.STATE !='预约取消'
+ and a.STATE !='待确认'
order by a.BEGIN_TIME asc
</select>
@@ -616,7 +618,7 @@
<select id="selectByProjUse" resultMap="SysBeauticianStateMap">
select * from sys_beautician_state
- where state!=#{state} puse_id in
+ where state!=#{state} and puse_id in
<foreach collection="list" index="index" item="item" open="("
separator="," close=")">
#{item.id}
@@ -625,6 +627,6 @@
<select id="selectBeauticianStateByPuseIdAndNoStatus" resultMap="SysBeauticianStateMap">
select * from sys_beautician_state
- where puse_id=#{puseId} ans state!=#{state}
+ where puse_id=#{puseId} and state!=#{state}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1