From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516 逻辑删除，更新字段IS_Delete字段为已删除，默认为空，删除后其余信息从查询中过滤了
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 6b6dfc9..d58c6c5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -14,7 +14,7 @@
<result property="orderNo" column="ORDER_NO"/>
<result property="activity" column="ACTIVITY"/>
<result property="total" column="TOTAL"/>
- <result property="cashierName" column="cashierName"/>
+
<result property="statu" column="STATU"/>
<result property="zkTotal" column="ZK_TOTAL"/>
@@ -31,7 +31,7 @@
<result property="arrears" column="arrears"/>
<result property="payTime" column="pay_time"/>
<result property="cashierId" column="cashier_id"/>
-
+ <result property="cashierName" column="cashierName"/>
<!-- 扩展字段 -->
<result property="shopName" column="SHOP_NAME"/>
<result property="shopShortName" column="SHOP_SHORT_NAME"/>
@@ -187,7 +187,7 @@
left JOIN sys_users c on c.su_id=a.STAFF_ID
left JOIN sys_users e on e.su_id=a.cashier_id
left JOIN sys_shop_info d on d.ID=a.SHOP_ID
- where 1=1
+ where 1=1 and (b.IS_DELETE is null or b.IS_DELETE = '')
<if test="record!=null">
<if test="record.keyWordVo != null and record.keyWordVo!='' ">
and (b.PHONE like concat('%',#{record.keyWordVo},'%')
@@ -275,7 +275,7 @@
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left JOIN sys_users c on c.su_id=a.STAFF_ID
left JOIN sys_shop_info d on d.ID=a.SHOP_ID
- where 1=1
+ where 1=1 and (b.IS_DELETE is null or b.IS_DELETE = '')
<if test="record!=null">
<if test="record.keyWordVo != null and record.keyWordVo!='' ">
and (b.PHONE like concat('%',#{record.keyWordVo},'%')
@@ -347,7 +347,7 @@
<select id="selectById" resultMap="SysOrderMap">
select
a.*,
- c.su_name as STAFF_NAME,
+ c.su_name as STAFF_NAME, e.su_name as cashierName,
d.SHOP_NAME,
d.shop_short_name,
b.PHONE,
@@ -355,6 +355,7 @@
from sys_order a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left JOIN sys_users c on c.su_id=a.STAFF_ID
+ left JOIN sys_users e on e.su_id=a.cashier_id
left JOIN sys_shop_info d on d.ID=a.SHOP_ID
where a.id=#{id}
</select>
--
Gitblit v1.9.1