From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index fbc426c..618e9b6 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -11,15 +11,12 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description 浠撳簱绠＄悊
@@ -72,7 +69,6 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
-// public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -88,12 +84,10 @@
paramts.put("CLASSIFICATION_CODE", param.getClassificationCode());
}
//鏈烘瀯id
-// sql.append(" and AGENCY_ID =:AGENCY_ID ");
-// if (param.getAgencyId() != null) {
-// paramts.put("AGENCY_ID", param.getAgencyId());
-// } else {
-// paramts.put("AGENCY_ID", Long.valueOf(sysInfo.getTenantId()));
-// }
+ if (param.getAgencyId() != null) {
+ sql.append(" and AGENCY_ID =:AGENCY_ID ");
+ paramts.put("AGENCY_ID", param.getAgencyId());
+ }
//鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
@@ -174,7 +168,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- public List<BaseWarehouse> getByAgencyId(Long agencyId) {
+ public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -183,6 +177,16 @@
sql.append(" and AGENCY_ID =:AGENCY_ID ");
paramts.put("AGENCY_ID", agencyId);
}
+ // 鏄惁涓洪粯璁や粨搴�
+ if (isDefault != null) {
+ sql.append(" and IS_DEFAULT =:isDefault ");
+ paramts.put("isDefault", isDefault);
+ }
+ // 鐘舵��
+ if (states != null) {
+ sql.append(" and states =:states ");
+ paramts.put("states", states);
+ }
return select(sql.toString(), paramts, new BaseWarehouse());
}
--
Gitblit v1.9.1