From a5edcd8e1ce08384d6b317756a9852be1bb33703 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Apr 2021 16:33:25 +0800
Subject: [PATCH] 20210415 签到
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 7a5a0e5..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>
@@ -410,6 +414,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,
@@ -420,7 +425,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
--
Gitblit v1.9.1