From 3e9a4b3480e6508f3c6f7ac8723509d8b1120d20 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 22 十二月 2023 11:26:33 +0800 Subject: [PATCH] 代码整理 --- consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 28 +++------------------------- 1 files changed, 3 insertions(+), 25 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java index 62f6b34..4eff7a9 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java @@ -14,7 +14,7 @@ import com.consum.base.pojo.BaseWarehouseParam; import com.consum.base.service.BaseWarehouseService; import com.consum.base.service.FinSysTenantService; -import com.consum.base.service.SDictDataServiceImpl; +import com.consum.base.service.SDictDataService; import com.consum.model.po.BaseWarehouse; import com.consum.model.po.FinSysTenant; import com.consum.model.po.FinSysTenantUser; @@ -37,7 +37,7 @@ @Autowired private FinSysTenantService finSysTenantService; @Autowired - private SDictDataServiceImpl sDictDataService; + private SDictDataService sDictDataService; /** * @Description 鏂板 @@ -162,7 +162,7 @@ * @Date 2023/10/27 */ @Override - public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) { + public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states) { StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); @@ -171,34 +171,12 @@ 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 - */ - @Override - 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()); - BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null); - return baseWarehouse; } @Override -- Gitblit v1.9.1