From 8f707f81128dc7b881f1533a8365a56dd015a7af Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Dec 2023 01:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E5=8D=95=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 2 +- .../DistributionReservationController.java | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 153720380..1baf7825b 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-tjj"; /** * 工厂对接服务名称 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index c2ecd5c08..cc8624fe9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -32,6 +33,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import org.springblade.common.constant.reservation.ReservationStatusConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -84,18 +86,37 @@ public class DistributionReservationController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distrbutionReservation") public R> list(@ApiIgnore @RequestParam Map distrbutionReservation, Query query) { + String excludeId = (String) distrbutionReservation.get("excludeId"); + if (Func.isNotEmpty(excludeId)){ + distrbutionReservation.remove("excludeId"); + } QueryWrapper queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class); //获取当前登录人仓库 List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); List collect = myWatchWarehouse.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); - queryWrapper.lambda().in(collect.size()>0,DistributionReservationEntity::getWarehouseId,collect); - IPage pages = reservationService.page(Condition.getPage(query),queryWrapper ); + LambdaQueryWrapper lambda = queryWrapper.lambda(); + lambda.in(collect.size()>0,DistributionReservationEntity::getWarehouseId,collect); + if (Func.isNotBlank(excludeId)){ + List ids = Func.toLongList(",", excludeId); + lambda.notIn(DistributionReservationEntity::getId,ids); + } + IPage pages = reservationService.page(Condition.getPage(query),lambda ); return R.data(DistributionReservationWrapper.build().pageVO(pages)); } + @GetMapping("/isDelivery") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distrbutionReservation") + public Boolean isDelivery(@RequestParam String ids) { + List list = Func.toLongList(ids); + List distributionReservationEntities = reservationService.listByIds(list); + return distributionReservationEntities.stream().anyMatch(distributionReservationEntity -> distributionReservationEntity.getReservationStatus() == ReservationStatusConstant.daipeisong.getValue()); + } + + /** * 商场客户预约列表 分页 */