From d96206828e1b1f79176ddbf2b2200b7eb3e45267 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 29 Jul 2026 10:06:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/order/HardCarDto.java | 15 ++++++++++- .../hard/api/dto/order/HardOrderDto.java | 4 +-- .../order/HardCanteenApptTotalController.java | 4 +-- .../order/HardCanteenDeptTotalController.java | 2 +- .../controller/order/HardOrderController.java | 4 +-- .../resources/mapper/order/HardCarMapper.xml | 27 ++++++++++++++++--- .../mapper/order/HardOrderMapper.xml | 2 +- 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java index 8327c6e0d..cbda23dd5 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java @@ -1,5 +1,7 @@ package com.bsd.pjcloud.hard.api.dto.order; +import com.bsd.pjcloud.admin.api.vo.base.BaseIsDeepDeptTreeInterface; +import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface; import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity; import lombok.Data; @@ -8,7 +10,7 @@ import java.time.LocalDateTime; import java.util.List; @Data -public class HardCarDto extends HardCarEntity { +public class HardCarDto extends HardCarEntity implements BaseIsIncludeTreeInterface { private Long orderId; @@ -28,4 +30,15 @@ public class HardCarDto extends HardCarEntity { private LocalDateTime[] apptUseDateTimeList; + /** + * 前端树搜索 + */ + private Long deptId; + + private List deptIds; + + private List userDeptIds; + + private Boolean isInclude; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java index 6ad8c89e8..9b63da90d 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java @@ -109,7 +109,7 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn private List appWardUserIds; /** - * `apptId`不为null + * `apptId`或者`appt_rule_id`不为null(筛选预约订单) */ - Boolean apptIdNotNull = false; + Boolean apptIdOrApptRuleIdNotNull = false; } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenApptTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenApptTotalController.java index ca3d159a2..7453957e6 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenApptTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenApptTotalController.java @@ -56,7 +56,7 @@ public class HardCanteenApptTotalController { dto.setMchIds(mchList.stream().map(MchManageVo::getId).toList()); } dto.setOrderType(HardOrderTypeEnum.RESERVE.getType()); - dto.setApptIdNotNull(true); + dto.setApptIdOrApptRuleIdNotNull(true); return R.ok(canteenApptTotalService.productReservTotal(page, dto, null)); } @@ -73,7 +73,7 @@ public class HardCanteenApptTotalController { dto.setMchIds(mchList.stream().map(MchManageVo::getId).toList()); } dto.setOrderType(HardOrderTypeEnum.RESERVE.getType()); - dto.setApptIdNotNull(true); + dto.setApptIdOrApptRuleIdNotNull(true); return R.ok(canteenApptTotalService.productReservTotal(page, dto, null)); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java index ab1eab0c1..4df49ca78 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenDeptTotalController.java @@ -44,7 +44,7 @@ public class HardCanteenDeptTotalController { PjcloudUser user = SecurityUtils.getUser(); dto.setTotalIsFindChildren(true); - dto.setApptIdNotNull(true); + dto.setApptIdOrApptRuleIdNotNull(true); return R.ok(canteenTotalService.listByDept(dto, user, dataScope)); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java index cda689eaa..c28f3e7d0 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java @@ -221,7 +221,7 @@ public class HardOrderController { PjcloudUser user = SecurityUtils.getUser(); dto.setOrderType(HardOrderTypeEnum.RESERVE.getType()); dto.setTotalIsFindChildren(false); - dto.setApptIdNotNull(true); + dto.setApptIdOrApptRuleIdNotNull(true); return R.ok(canteenTotalService.listByDept(dto, user, dataScope)); } @@ -232,7 +232,7 @@ public class HardOrderController { dto.setIsFindApptList(true); dto.setOrderType(HardOrderTypeEnum.RESERVE.getType()); dto.setOrderStatusCodes(List.of(HardOrderStatusEnum.PAY.getType(), HardOrderStatusEnum.CANCEL.getType())); - dto.setApptIdNotNull(true); + dto.setApptIdOrApptRuleIdNotNull(true); DataScope dataScope = null; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml index e4320600b..ef1abb4b4 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml @@ -249,8 +249,8 @@ o.hour_type not in ('-1') - - and o.appt_id is not null + + and (o.appt_id is not null or o.appt_rule_id is not null) and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]} @@ -403,6 +403,25 @@ #{v} + + and o.user_dept_id = #{dto.deptId} + + + + + and o.user_dept_id IN + + + and o.user_dept_id NOT IN + + + and o.user_dept_id IN + + + + #{v} + + group by o.merchant_id, a.product_id order by o.merchant_id, SUM(a.product_count) desc @@ -424,8 +443,8 @@ and o.order_status = #{dto.orderStatus} - - and o.appt_id is not null + + and (o.appt_id is not null or o.appt_rule_id is not null) and o.order_status in diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index 426e145d1..65eb1d4b2 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -50,7 +50,7 @@ a.del_flag = '0' - + and (a.appt_id is not null or a.appt_rule_id is not null)