From af27c7e07d7717d25ef06d4a4ae9e56ea184116a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index 149c7f9..a14e7aa 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -21,8 +21,8 @@
}
@Override
- public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
+ public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition, status));
}
@Override
@@ -81,6 +81,11 @@
}
@Override
+ public Integer selectCountByUserYearAndStatus(Long userId, String year, Integer status) {
+ return this.baseMapper.selectCountByUserYearAndStatus(userId, year, status);
+ }
+
+ @Override
public List<Order> selectTopMoney() {
return this.baseMapper.selectTopMoney();
}
--
Gitblit v1.9.1