From ea939f62ac2d372f52374064c32ac1c001d2ef9b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 十一月 2023 16:16:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..f9a0459 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, Long director, String condition, Integer status) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId,director, condition, status));
}
@Override
@@ -43,9 +43,9 @@
private String getNextUuid(Long hostId) {
Order order = this.baseMapper.selectOrderByNewestUuid(hostId);
if (order == null) {
- return "0001";
+ return "00001";
}
- return zerofill(String.valueOf(Integer.parseInt(order.getUuid()) + 1), 4);
+ return zerofill(String.valueOf(Integer.parseInt(order.getUuid()) + 1), 5);
}
public static String zerofill(String msg, Integer count){
@@ -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