From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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..f2d56cd 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
@@ -9,6 +9,7 @@
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.SDictData;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
@@ -34,9 +35,7 @@
@Autowired
private FinSysTenantServiceImpl finSysTenantService;
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
- @Autowired
- private FinSysTenantUserServiceImpl userService;
+ private FinSysTenantDepartmentService departmentService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@@ -72,7 +71,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 +86,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 +170,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<>();
@@ -182,6 +178,16 @@
if (agencyId != null) {
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());
}
@@ -204,4 +210,23 @@
}
return null;
}
+
+ public BaseWarehouse getWarehouseByAgencyId(Long agencyId, String warehouseName) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE STATES= 1");
+ Map<String, Object> param = new HashMap<>();
+ if (agencyId != null) {
+ sql.append(" and AGENCY_ID =:agencyId ");
+ param.put("agencyId", agencyId);
+ }
+ if (StringUtils.isNotEmpty(warehouseName)) {
+ sql.append(" and WAREHOUSE_NAME =:warehouseName ");
+ param.put("warehouseName", warehouseName);
+ }
+ sql.append(" limit 1");
+ List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+ return select.get(0);
+ }
}
--
Gitblit v1.9.1