From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 6262844..144ab7e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -137,9 +137,9 @@
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,
+ d.source as pu_source
from sys_beautician_state a
left join sys_users b on a.staff_id= b.su_id
left join shopping_goods c on a.proj_id=c.id
@@ -147,10 +147,14 @@
where a.SERVICES_ID =#{serId}
</select>
+ <!-- EXC_TIME =TIMESTAMPDIFF(MINUTE,BEGIN_TIME,now()) -->
<update id="chengItemState">
- update sys_beautician_state set state=#{record.state},
- EXC_TIME =TIMESTAMPDIFF(MINUTE,BEGIN_TIME,now())
- where STAFF_ID=#{record.staffId} and SERVICES_ID =#{record.servicesId}
+ update sys_beautician_state set state=#{record.state}
+ where 1=1
+ <if test="record.staffId != null">
+ and STAFF_ID=#{record.staffId}
+ </if>
+ and SERVICES_ID =#{record.servicesId}
</update>
<!-- 根据id更新 部分更新 -->
@@ -172,7 +176,7 @@
<if test="servicesId != null and servicesId !='' ">
SERVICES_ID = #{servicesId},
</if>
- <if test="servicesId != null and servicesId !='' ">
+ <if test="excTime != null and excTime !='' ">
EXC_TIME = #{excTime},
</if>
--
Gitblit v1.9.1