From a74220045c6fb618c1bbebbfd9714587c336a776 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 30 Aug 2023 17:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataWarehouseClient.java | 5 +++-- .../controller/BasicdataTeamGroupController.java | 15 ++++++++++++++- .../basicdata/feign/BasicdataWarehouseClient.java | 1 + .../service/IDistributionReservationService.java | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 604e24882..70b6b07cf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -44,6 +44,7 @@ public interface IBasicdataWarehouseClient { String API_PREFIX = "warehouse/client"; String TOP = API_PREFIX + "/top"; String GETWAREHOUSE = API_PREFIX + "/warehouse"; + String WAREHOUSEBYDEPARTMENT = API_PREFIX+"/getWarehouseByDepartment"; /** * 获取仓库列表 @@ -77,8 +78,8 @@ public interface IBasicdataWarehouseClient { BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(@RequestParam String warehouseCode); - @GetMapping(API_PREFIX+"/getWarehouseByDepartment") - BasicdataWarehouseEntity getWarehouseByDepartment(@RequestParam String deptId); + @GetMapping(WAREHOUSEBYDEPARTMENT) + BasicdataWarehouseEntity getWarehouseByDepartment(String deptId); /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java index 25554fecd..299afc949 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java @@ -16,6 +16,8 @@ */ package com.logpm.basicdata.controller; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -26,7 +28,9 @@ import javax.validation.Valid; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.AesUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -42,6 +46,7 @@ import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; /** @@ -58,6 +63,8 @@ public class BasicdataTeamGroupController extends BladeController { private final IBasicdataTeamGroupService basicdataTeamGroupService; + private final IBasicdataWarehouseClient basicdataWarehouseClient; + /** * 基础班组表 详情 */ @@ -75,7 +82,13 @@ public class BasicdataTeamGroupController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入basicdataTeamGroup") public R> list(@ApiIgnore @RequestParam Map basicdataTeamGroup, Query query) { - IPage pages = basicdataTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class)); + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class); + List myWarehouseList = basicdataWarehouseClient.getMyWarehouseList(); + if(myWarehouseList.size() > 0){ + List collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getDepartment).collect(Collectors.toList()); + queryWrapper.in("department",collect); + } + IPage pages = basicdataTeamGroupService.page(Condition.getPage(query),queryWrapper); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index 267dcb31a..90be952e9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -161,6 +161,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { } @Override + @GetMapping(WAREHOUSEBYDEPARTMENT) public BasicdataWarehouseEntity getWarehouseByDepartment(String deptId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("department",deptId) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 882bc3ebc..549ef72ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -78,6 +78,10 @@ public interface IDistributionReservationService extends BaseService