From 3701dcb2483643ac40d4b81c021b3d8cdab62402 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 06 九月 2024 21:50:18 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 9a85483..0263b89 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -27,7 +27,7 @@
* @param orderState 订单状态
* @return 本年订单数量
*/
- List<OrderQueryVO> orderCountByYear(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState);
+ List<OrderQueryVO> orderCountByYear(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 查询本月订单数量
@@ -36,7 +36,7 @@
* @param orderState 订单状态
* @return 本年订单数量
*/
- List<OrderQueryVO> orderCountByMonth(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState);
+ List<OrderQueryVO> orderCountByMonth(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 查询本周订单数量
@@ -45,7 +45,7 @@
* @param orderState 订单状态
* @return 本年订单数量
*/
- List<OrderQueryVO> orderCountByWeek(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState);
+ List<OrderQueryVO> orderCountByWeek(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 查询当天订单数量
@@ -54,7 +54,7 @@
* @param orderState 订单状态
* @return 本年订单数量
*/
- List<OrderQueryVO> orderCountByToday(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState);
+ List<OrderQueryVO> orderCountByToday(@Param("cityList") List<String> cityList, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 查询整个季度的交易额(订单状态为:已完工)
@@ -93,7 +93,8 @@
* @return 分页统计
*/
Page<OrderCountVO> orderCount(@Param("name") String name, @Param("phone") String phone,
- @Param("cityList") List<String> cityList, Page<OrderCountVO> page);
+ @Param("cityList") List<String> cityList, Page<OrderCountVO> page,
+ @Param("siteIds") List<String> siteIds);
/**
* 订单列表
@@ -103,6 +104,7 @@
* @return 分页
*/
Page<Order> queryPage(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
+ Page<Order> queryPage1(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
/**
* 订单管理分页模块，订单数量统计
@@ -164,7 +166,7 @@
* @return 列表
*/
List<OrderQueryVO> orderCountByTimeRange(@Param("cityList") List<String> cityList, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("orderState") Integer orderState);
+ @Param("endTime") String endTime, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 根据时间范围筛选订单
@@ -177,7 +179,7 @@
* @return 列表
*/
List<OrderQueryVO> orderCountByTimeRangeYear(@Param("cityList") List<String> cityList, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("orderState") Integer orderState);
+ @Param("endTime") String endTime, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
/**
* 根据时间范围筛选订单
@@ -190,7 +192,7 @@
* @return 列表
*/
List<OrderQueryVO> orderCountByTimeRangeMonth(@Param("cityList") List<String> cityList, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("orderState") Integer orderState);
+ @Param("endTime") String endTime, @Param("orderState") Integer orderState,@Param("siteIds") List<String> siteIds);
List<PaperInVo> papercout(@Param("workId")String workId,@Param("date")String date);
}
--
Gitblit v1.7.1