bug修改

无关风月

2 天以前 1442f149019ee0590389abd7a88a79c4d9b59034

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.order.entity.Order;
import com.ruoyi.order.vo.*;
import org.apache.ibatis.annotations.Param;
@@ -26,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);

    /**
     * 查询本月订单数量
@@ -35,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);

    /**
     * 查询本周订单数量
@@ -44,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);

    /**
     * 查询当天订单数量
@@ -53,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);

    /**
     * 查询整个季度的交易额(订单状态为:已完工)
@@ -92,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);

    /**
     * 订单列表
@@ -102,14 +104,15 @@
     * @return 分页
     */
    Page<Order> queryPage(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);

    Page<Order> queryPage1(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
    List<Order> excelExportList(@Param("data") OrderQueryRequest orderQueryRequest);
    /**
     * 订单管理分页模块，订单数量统计
     *
     * @param orderQueryRequest 筛选参数
     * @return 统计数量
     */
    List<Order> orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);
    Order orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);

    /**
     * 根据所选id查询
@@ -135,7 +138,7 @@
     * @param page   分页
     * @return 交易额
     */
    Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state, Page<Order> page);
    Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state,@Param("searchValues")String searchValues, Page<Order> page);

    /**
     * 师傅端-根据师傅id获取订单数量
@@ -163,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);

    /**
     * 根据时间范围筛选订单
@@ -176,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);

    /**
     * 根据时间范围筛选订单
@@ -189,5 +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);
}