From 6766d8988e304577fb660991659688006f41493e Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sat, 02 Jul 2022 16:13:40 +0800
Subject: [PATCH] 肽妍切换数据库
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
index 1af5845..f93a4cf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -380,6 +380,7 @@
c.NAME as gs_NAME,
c.UNIT as gs_UNIT,
c.good_type as gs_good_type,
+ c.measure as gs_measure,
c.GOODS_SORT_ID as gs_GOODS_SORT_ID,
c.SUPPLIER_ID as gs_SUPPLIER_ID,
(select TYPE_NAME from sys_goods_type t where t.id=c.GOODS_SORT_ID) gs_goodsSortName,
@@ -388,6 +389,7 @@
c.volume as gs_volume,
c.price as gs_price,
c.wholesale as gs_wholesale,
+ c.img as gs_img,
a.shop_id,
a.company_id
from
@@ -404,6 +406,10 @@
</if>
<if test="record.batch != null and record.batch !='' ">
and batch = #{record.batch}
+ </if>
+
+ <if test="record.queryKey != null and record.queryKey !='' ">
+ and (instr(c.name,#{record.queryKey}) or instr(c.goods_no, #{record.queryKey}) or instr(c.zjm, #{record.queryKey}))
</if>
<if test="record.storeId != null and record.storeId !='' ">
and STORE_ID = #{record.storeId}
@@ -477,6 +483,9 @@
</if>
<if test="record.batch != null and record.batch !='' ">
and batch = #{record.batch}
+ </if>
+ <if test="record.queryKey != null and record.queryKey !='' ">
+ and (instr(c.name,#{record.queryKey}) or instr(c.goods_no, #{record.queryKey}) or instr(c.zjm, #{record.queryKey}))
</if>
<if test="record.storeId != null and record.storeId !='' ">
and STORE_ID = #{record.storeId}
@@ -657,6 +666,7 @@
FROM
(
SELECT
+ b.id id,
b.create_time as createTime,
e.CODE,
e.NAME,
@@ -669,7 +679,9 @@
b.remark,
b.TYPE AS orderType ,
c.su_name as userName,
- d.SHOP_NAME as shopName
+ d.SHOP_NAME as shopName,
+ b.SERVICE_ID as serviceId,
+ b.ORDER_ID as orderId
FROM
sys_out_store_item a
LEFT JOIN sys_out_store b ON a.OUT_STORE_ID = b.id
@@ -708,6 +720,7 @@
UNION ALL
SELECT
+ t2_b.id id,
t2_b.create_time,
t2_e.CODE,
t2_e.NAME,
@@ -720,7 +733,9 @@
t2_b.remark,
t2_b.instore_type,
t2_c.su_name,
- t2_d.SHOP_NAME
+ t2_d.SHOP_NAME,
+ '' as serviceId,
+ '' as orderId
FROM
sys_instore_detail t2_a
LEFT JOIN sys_instore_info t2_b ON t2_a.INSTORE_ID = t2_b.id
@@ -811,6 +826,9 @@
<if test=" record.endTime!=null ">
<![CDATA[ and #{record.endTime} >=b.create_time]]>
</if>
+ <if test="record.companyId != null and record.companyId !='' ">
+ and b.company_id = #{record.companyId}
+ </if>
</where>
UNION ALL
SELECT
@@ -846,6 +864,9 @@
<if test=" record.endTime!=null ">
<![CDATA[ and #{record.endTime} >= t2_b.create_time ]]>
</if>
+ <if test="record.companyId != null and record.companyId !='' ">
+ and t2_b.company_id = #{record.companyId}
+ </if>
</where>
) t
--
Gitblit v1.9.1