From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 12:26:25 +0800
Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号
---
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 98 +++++++++++++++++++------------------------------
1 files changed, 38 insertions(+), 60 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 c2e08b0..62f6b34 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
@@ -1,30 +1,28 @@
package com.consum.base.service.impl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.SDictDataServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
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;
-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;
/**
* @Description 浠撳簱绠＄悊
@@ -37,9 +35,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
- @Autowired
- private FinSysTenantDepartmentService departmentService;
+ private FinSysTenantService finSysTenantService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@@ -55,13 +51,13 @@
baseWarehouse.setId(IdUtil.generateId());
baseWarehouse.setWarehouseType(Constants.WAREHOUSE_TYPE_TENANT);
baseWarehouse.setWarehouseCode(codeGeneratorService.createWarehouseCode());
- //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ // 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
if (finSysTenant != null) {
baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
baseWarehouse.setAgencyName(finSysTenant.getName());
}
- //鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
+ // 鏍规嵁CLASSIFICATION_CODE鏌ヨCLASSIFICATION_NAME
SDictData dictData = this.sDictDataService.get(new SDictData(Long.valueOf(param.getClassificationCode())));
if (dictData != null) {
baseWarehouse.setClassificationName(dictData.getDict_label());
@@ -77,26 +73,34 @@
* @Date 2023/10/26
*/
@Override
- public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param) {
+ public GenericPager<BaseWarehouse> queryList(BaseWarehouseParam param, FinSysTenantUser currentUser) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //浠撳簱鍚嶇О
+ // 浠撳簱鍚嶇О
if (!StringUtils.isEmpty(param.getWarehouseName())) {
sql.append(" and WAREHOUSE_NAME like:WAREHOUSE_NAME ");
- paramts.put("WAREHOUSE_NAME", StringUtils.CHAR_PERCENT + param.getWarehouseName() + StringUtils.CHAR_PERCENT);
+ paramts.put("WAREHOUSE_NAME",
+ StringUtils.CHAR_PERCENT + param.getWarehouseName() + StringUtils.CHAR_PERCENT);
}
- //绫诲瀷
+ // 绫诲瀷
if (!StringUtils.isEmpty(param.getClassificationCode())) {
sql.append(" and CLASSIFICATION_CODE =:CLASSIFICATION_CODE ");
paramts.put("CLASSIFICATION_CODE", param.getClassificationCode());
}
- //鏈烘瀯id
+ // 鏈烘瀯id
+ // 鍥犱负浠撳簱鏄渷鍏徃缁熶竴缁存姢鐨勶紝鐪佸彲浠ョ湅鍒板叏閮紝鍦板競鍜屽幙鍖虹湅鑷繁鐨�
if (param.getAgencyId() != null) {
- sql.append(" and AGENCY_ID =:AGENCY_ID ");
- paramts.put("AGENCY_ID", param.getAgencyId());
+ Integer lv = currentUser.getLv();
+ if (lv != 1) {
+ sql.append(" and AGENCY_ID =:AGENCY_ID ");
+ paramts.put("AGENCY_ID", param.getAgencyId());
+ } else {
+ sql.append(" and AGENCY_ID like :AGENCY_ID ");
+ paramts.put("AGENCY_ID", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ }
}
- //鐘舵��
+ // 鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
paramts.put("states", param.getStates());
@@ -115,11 +119,12 @@
*/
@Override
public int updateBaseWarehouse(BaseWarehouse baseWarehouse) {
- SDictData SDictData = this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
+ SDictData SDictData =
+ this.sDictDataService.get(new SDictData(Long.valueOf(baseWarehouse.getClassificationCode())));
if (SDictData != null) {
baseWarehouse.setClassificationName(SDictData.getDict_label());
}
- //鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
+ // 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯
FinSysTenant finSysTenant = finSysTenantService.get(new FinSysTenant(baseWarehouse.getAgencyId()));
if (finSysTenant != null) {
baseWarehouse.setParentAgencyId(finSysTenant.getParentId());
@@ -151,41 +156,17 @@
}
/**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- @Override
- public void queryUserList(Long baseWarehouseId) {
- //1.鏍规嵁浠撳簱id鏌ヨ浠撳簱
- BaseWarehouse baseWarehouse = this.getById(baseWarehouseId);
- if (baseWarehouse != null) {
- Long agencyId = baseWarehouse.getAgencyId();
- String agencyName = baseWarehouse.getAgencyName();
- //2.鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬
- List<FinSysTenantDepartment> list = this.departmentService.getByTenantId(agencyId);
- //鑾峰彇閮ㄩ棬id
- Set<Long> deptIds = list.stream().map(dept -> dept.getId()).collect(Collectors.toSet());
- //3.鏍规嵁閮ㄩ棬id鏌ヨ鐢ㄦ埛
- //this.userService.getByDeptIds();
-
- }
-
-
- }
-
- /**
* @return
* @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
@Override
- public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) {
+ public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯id
+ // 鏈烘瀯id
if (agencyId != null) {
sql.append(" and AGENCY_ID =:AGENCY_ID ");
paramts.put("AGENCY_ID", agencyId);
@@ -203,7 +184,6 @@
return select(sql.toString(), paramts, new BaseWarehouse());
}
-
/**
* 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
*
@@ -212,15 +192,13 @@
*/
@Override
public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) {
- StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =: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;
+ BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
+ return baseWarehouse;
}
@Override
--
Gitblit v1.9.1