From a9e6d28afd04a92f0830dcc3557d73f48534ec4a Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Wed, 28 Jul 2021 16:48:59 +0800 Subject: [PATCH] 1 --- zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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 6f41218..6bafe6f 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, @@ -405,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} @@ -479,6 +484,9 @@ <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} </if> -- Gitblit v1.9.1