From 8ec414eb3a5173c1f53bd33b73519c78ca79938a Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 27 十月 2023 17:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 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 8201368..5a2733b 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,7 +9,6 @@
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -49,12 +48,12 @@
baseWarehouse.setId(IdUtil.generateId());
baseWarehouse.setWarehouseType(Constants.WAREHOUSE_TYPE_TENANT);
baseWarehouse.setWarehouseCode(codeGeneratorService.createWarehouseCode());
- //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
- FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
- if (finSysTenant != null) {
- baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
- baseWarehouse.setAgencyName(finSysTenant.getName());
- }
+// //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+// FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
+// if (finSysTenant != null) {
+// baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
+// baseWarehouse.setAgencyName(finSysTenant.getName());
+// }
baseWarehouse.setIsDefault(Constants.IS_DEFAULT_YES);
return this.insert(baseWarehouse);
@@ -65,7 +64,8 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser sysInfo) {
+// 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<>();
@@ -80,12 +80,12 @@
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()));
- }
+// 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.getStates() != null) {
sql.append(" and states =:states ");
@@ -148,4 +148,22 @@
}
+
+ /**
+ * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ * @return
+ */
+ public List<BaseWarehouse> getByAgencyId(Long agencyId) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ //鏈烘瀯id
+ if (agencyId != null) {
+ sql.append(" and AGENCY_ID =:AGENCY_ID ");
+ paramts.put("AGENCY_ID", agencyId);
+ }
+ return select(sql.toString(), paramts, new BaseWarehouse());
+ }
}
--
Gitblit v1.9.1