From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index 2b3a9aa..e6ed5bb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -140,7 +140,7 @@
<!-- 根据id更新 部分更新 -->
<update id="updateOrderTime">
- UPDATE sys_proj_services set CREATE_TIME=#{createTime} WHERE id=#{id}
+ UPDATE sys_proj_services set consume_time=#{consumeTime} WHERE id=#{id}
</update>
<!-- 设置服务单为已通知 -->
@@ -328,9 +328,7 @@
<if test="record.vipId != null and record.vipId !='' ">
and a.VIP_ID = #{record.vipId}
</if>
- <if test="record.isOverTime != null and record.serviceNo !='' ">
- and a.IS_OVERTIME > #{record.isOverTime}
- </if>
+
<if test="record.serviceNo != null and record.serviceNo !='' ">
and a.SERVICE_NO like CONCAT('%',#{record.serviceNo},'%')
</if>
@@ -700,4 +698,10 @@
</select>
+ <select id="selectProjServicesByOrderItemId" resultMap="SysProjServicesMap">
+ select a.* from sys_proj_services a
+ inner join sys_beautician_state b on a.id=b.SERVICES_ID
+ inner join sys_proj_use c on c.id=b.puse_id
+ where ORDER_ITEM_ID=#{itemId} and a.STATE!='预约取消'
+ </select>
</mapper>
--
Gitblit v1.9.1