From 986e2fd11b5c0c22766ebe3f9b5f39a6fa4d8c9f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:33:14 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 7a8c0b5..31b0dfe 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -333,7 +333,8 @@
and a.STAFF_ID = #{suId} ]]>
and a.STATE !='预约取消'
and a.STATE !='待确认'
- and a.STATE !='待预约' and (c.IS_DELETE is null or c.IS_DELETE = '')
+ and a.STATE !='服务单结束'
+ and a.STATE !='待预约'
order by a.BEGIN_TIME asc
</select>
--
Gitblit v1.9.1