From 6b3c73f25a2c74508ed9df4a513ce70cb14837a7 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Mon, 2 Mar 2026 09:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E8=B4=A7=E4=B8=BB=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=9C=A8=E5=A4=9A=E4=B8=AA=E4=BB=93=E5=BA=93=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E7=A7=9F=E8=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Lease/LeaseApplicationService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index 9d08d1ce5..66cf872e0 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -149,7 +149,7 @@ public class LeaseApplicationService { leaseDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); leaseDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), null); + List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), null,leaseDO.getWarehouseId()); if (ObjectUtil.isNotEmpty(timeOverlapSimple)) { throw new ServiceException("同一货主租赁信息时间不能重叠"); } @@ -166,12 +166,13 @@ public class LeaseApplicationService { leaseDO.setWarehouseName(warehouseFeignPO.getWarehouseName()); } - private List isTimeOverlapSimple(String cargoOwnerName, Date startDate, Date endDate, Long excludeId) { + private List isTimeOverlapSimple(String cargoOwnerName, Date startDate, Date endDate, Long excludeId,Long warehouseId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Lease::getCargoOwnerName, cargoOwnerName) .eq(Lease::getDelFlag, 1) // 只查询正常状态 .le(Lease::getStartDate, endDate) - .ge(Lease::getEndDate, startDate); + .ge(Lease::getEndDate, startDate) + .eq(Lease::getWarehouseId, warehouseId); if (excludeId != null) { wrapper.ne(Lease::getId, excludeId); } @@ -182,7 +183,7 @@ public class LeaseApplicationService { * 修改租赁管理 */ public Boolean update(LeaseDO leaseDO) { - List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), leaseDO.getId()); + List timeOverlapSimple = isTimeOverlapSimple(leaseDO.getCargoOwnerName(), leaseDO.getStartDate(), leaseDO.getEndDate(), leaseDO.getId(),leaseDO.getWarehouseId()); if (ObjectUtil.isNotEmpty(timeOverlapSimple)) { throw new ServiceException("同一货主租赁信息时间不能重叠"); }