From b43d3b638790b8fc4398a803f9e18af2b35efac6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 15:27:28 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java | 2 +-
zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 7 +++++++
zq-erp/src/main/java/com/matrix/system/hive/bean/SysStoreInfo.java | 11 +++++++++++
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
index 6df035b..d05dbe5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
@@ -49,7 +49,7 @@
sysStoreInfo.setShopId(users.getShopId());
sysStoreInfo.setCompanyId(users.getCompanyId());
}
-
+ sysStoreInfo.setQueryKey(storeListDto.getQueryKey());
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset((storeListDto.getPageNum() - 1) * storeListDto.getPageSize());
pageVo.setLimit(storeListDto.getPageSize());
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysStoreInfo.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysStoreInfo.java
index 4be4827..658e142 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysStoreInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysStoreInfo.java
@@ -87,6 +87,17 @@
private String name;
+ @Extend
+ private String queryKey;
+
+ public String getQueryKey() {
+ return queryKey;
+ }
+
+ public void setQueryKey(String queryKey) {
+ this.queryKey = queryKey;
+ }
+
public String getName() {
return name;
}
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..7c421b5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -406,6 +406,10 @@
<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>
@@ -479,6 +483,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