fix:食堂菜品预约修改统计

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<Long> deptIds;
+
+    private List<Long> userDeptIds;
+
+    private Boolean isInclude;
+
 }

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<Long> appWardUserIds;
 
     /**
-     * `apptId`不为null
+     * `apptId`或者`appt_rule_id`不为null(筛选预约订单)
      */
-    Boolean apptIdNotNull = false;
+    Boolean apptIdOrApptRuleIdNotNull = false;
 }