feat:食堂菜品部门统计

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -59,4 +59,14 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private String createTimeStr;
 
+    /**
+     * 是否查询时间段为空的数据
+     */
+    private Boolean hourTypeIsNotEmpty = false;
+
+    /**
+     * 是否查询商品描述不为空的数据
+     */
+    private Boolean productDescIsNotEmpty = false;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class HardCanteenProductTotalVo {
@@ -11,6 +12,12 @@ public class HardCanteenProductTotalVo {
     @Schema(description = "唯一编号")
     private String uniqueCode;
 
+    @Schema(description = "商户id")
+    private Long mchId;
+
+    @Schema(description = "商户名称")
+    private String mchName;
+
     @Schema(description = "部门id")
     private Long userDeptId;
 
@@ -35,4 +42,9 @@ public class HardCanteenProductTotalVo {
     @Schema(description = "购买次数")
     private Long timeCount;
 
+    @Schema(description = "用餐部门总数")
+    private Integer deptCount;
+
+    private List<HardCanteenProductTotalVo> children;
+
 }