From 6add6b3044b74d654ccb065e63d24bbc96eb0d6f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jan 2021 13:05:00 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml |    4 +++-
 1 files changed, 3 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 baafcdc..f6f6e44 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>
@@ -455,7 +457,7 @@
             </if>
 
             <if test="cateId != null and cateId != ''  ">
-                and  c.PROJ_TYPE_ID=#{cateId}
+                and  c.cate_id=#{cateId}
             </if>
 
 

--
Gitblit v1.9.1