From 9253517ff8a10e2df7924fdf6e0b737544d1a859 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Sat, 16 Jan 2021 17:30:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api --- 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