From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口

---
 consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java |   78 +++++++++++++++++++++++++++++++-------
 1 files changed, 63 insertions(+), 15 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 253d995..dea1689 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
@@ -2,19 +2,21 @@
 
 import com.consum.base.Constants;
 import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.pojo.BaseWarehouseParam;
 import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.pojo.BaseWarehouseParam;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenant;
+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 org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -68,7 +70,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<>();
@@ -84,12 +85,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 ");
@@ -123,6 +122,7 @@
 
     /**
      * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+     *
      * @author 鍗㈠簡闃�
      * @Date 2023/10/26
      */
@@ -164,12 +164,12 @@
     }
 
     /**
-     * @Description  鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
+     * @return
+     * @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/27
-     * @return
      */
-    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<>();
 
@@ -178,6 +178,54 @@
             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());
     }
+
+
+    /**
+     * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
+     *
+     * @param agencyId
+     * @return
+     */
+    public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId ");
+        Map<String, Object> param = new HashMap<>();
+        param.put("agencyId", agencyId);
+        List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
+        Optional<BaseWarehouse> optional = select.stream().findFirst();
+        if (optional.isPresent()) {
+            return optional.get();
+        }
+        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