From 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 13 Jan 2021 20:40:40 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 2 ++
1 files changed, 2 insertions(+), 0 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 baafcdc..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>
--
Gitblit v1.9.1