From 5f29f86819e170faaf0159f730d83ad19c8bd2a7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 20 Aug 2021 14:27:37 +0800
Subject: [PATCH] 新增门店是否只能取消待付款订单,服务单
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index f1e1cbb..957d259 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -856,7 +856,8 @@
<update id="updateInvalidProjUse" >
update sys_proj_use set STATUS='无效'
- where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
+ where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d')
+ and STATUS='有效'
</update>
<resultMap type="SysProjUse" id="TaoCanWithProjMap">
@@ -923,7 +924,7 @@
left join shopping_goods f on e.proj_id=f.id
where 1=1 and a.type='套餐' and a.TAOCAN_ID IS NULL
<if test="record.queryKey != null and record.queryKey !='' ">
- and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
+ and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(b.goods_no, #{record.queryKey}))
</if>
<if test="record.isOver != null and record.isOver !='' ">
and a.IS_OVER = #{record.isOver}
--
Gitblit v1.9.1