From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 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 f5b7550..28022f2 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -40,6 +40,8 @@
<result property="companyId" column="company_id"/>
<result property="comment" column="comment"/>
<result property="reply" column="reply"/>
+ <result property="overtimeNotice" column="overtime_notice"/>
+
<result property="beautiName" column="beautiName"/>
@@ -47,6 +49,7 @@
<result property="shopName" column="shopName"/>
<result property="createStaffName" column="createStaffName"/>
<result property="bedName" column="bedName"/>
+ <result property="vipName" column="VIP_Name"/>
<association property="vipInfo" resultMap="com.matrix.system.hive.dao.SysVipInfoDao.SysVipInfoMapSimple" ></association>
@@ -91,7 +94,8 @@
consume_time,
company_id,
comment,
- reply
+ reply,
+ overtime_notice
)
VALUES (
#{id},
@@ -128,15 +132,28 @@
#{consumeTime},
#{companyId},
#{comment},
- #{reply}
+ #{reply},
+ #{overtimeNotice}
)
</insert>
<!-- 根据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>
+
+ <!-- 设置服务单为已通知 -->
+ <update id="updateNoticeTimes" >
+ UPDATE sys_proj_services set overtime_notice=1
+ where ID in
+ <foreach collection="list" index="index" item="item" open="("
+ separator="," close=")">
+ #{item}
+ </foreach>
+ </update>
+
+
<update id="update">
UPDATE sys_proj_services
@@ -229,24 +246,25 @@
CHANGE_ID = #{changeId},
</if>
<if test="oldShopId != null and oldShopId !='' ">
- OLD_SHOP_ID = #{oldShopId}
+ OLD_SHOP_ID = #{oldShopId},
</if>
<if test="consumeTime != null ">
- consume_time = #{consumeTime}
+ consume_time = #{consumeTime},
</if>
<if test="reply != null ">
- reply = #{reply}
+ reply = #{reply},
</if>
<if test="comment != null ">
- comment = #{comment}
+ comment = #{comment},
+ </if>
+ <if test="overtimeNotice != null ">
+ overtime_notice = #{overtimeNotice},
</if>
</set>
WHERE id=#{id}
</update>
- <update id="comment">
- </update>
<!-- 批量删除 -->
<delete id="deleteByIds" parameterType="java.util.List">
@@ -410,7 +428,21 @@
left join sys_beautician_state c on a.id=c.SERVICES_ID
where a.ID=#{id}
</select>
-
+
+ <select id="selectNeedNoticeService" resultMap="SysProjServicesMap">
+ select
+ a.id,
+ a.company_id,
+ b.VIP_Name
+ FROM sys_proj_services a
+ LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
+ where a.YY_TIME > now()
+ and DATE_ADD(now(),INTERVAL 1 HOUR) > a.YY_TIME
+ and overtime_notice is null
+ </select>
+
+
+
<!-- 根据对象查询-->
<select id="selectByModel" resultMap="SysProjServicesMap">
select distinct
@@ -517,6 +549,7 @@
left join sys_proj_use g on b.puse_id=g.ID
left join sys_shop_info h on a.SHOP_ID=h.ID
<where>
+ and a.company_id=#{record.companyId}
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
</if>
@@ -553,6 +586,7 @@
left join sys_users f on f.su_id=b.STAFF_ID
left join sys_proj_use g on b.puse_id=g.ID
<where>
+ and a.company_id=#{record.companyId}
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(a.SERVICE_NO, #{record.queryKey}) or instr(e.phone, #{record.queryKey}) or instr(e.vip_name, #{record.queryKey}) )
</if>
@@ -666,5 +700,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