From 7fb8daefab9776720052db58bee680f1ab8bba04 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Mar 2021 14:30:46 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..b74ebeb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -137,7 +137,8 @@
d.id as pu_id,
d.SURPLUS_COUNT as pu_SURPLUS_COUNT,
d.ASSEMBLE_ID as pu_ASSEMBLE_ID,
- d.price as pu_price
+ d.price as pu_price,
+ d.taocan_id as pu_taocan_id
from sys_beautician_state a
@@ -327,6 +328,9 @@
<![CDATA[ a.BEGIN_TIME > #{beginTime}
and a.END_TIME < #{endTime}
and a.STAFF_ID = #{suId} ]]>
+ and a.STATE !='预约取消'
+ and a.STATE !='待确认'
+ and a.STATE !='待预约'
order by a.BEGIN_TIME asc
</select>
@@ -407,6 +411,7 @@
<select id="selectItemDetail" resultType="java.util.HashMap" parameterType="java.util.HashMap">
select
f.SHOP_NAME,
+ b.yy_time,
b.consume_time,
b.SERVICE_NO,
d.su_name,
@@ -417,7 +422,8 @@
a.COUNT,
h.PRICE,
h.SOURCE,
- a.STATE
+ a.STATE,
+ a.extract
from sys_beautician_state a
left join sys_proj_services b on a.SERVICES_ID=b.ID
left join shopping_goods c on a.proj_id=c.id
@@ -455,7 +461,7 @@
</if>
<if test="cateId != null and cateId != '' ">
- and c.PROJ_TYPE_ID=#{cateId}
+ and c.cate_id=#{cateId}
</if>
@@ -616,7 +622,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 +631,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