From 6630484f4d595c468dba6b07d4586bfbb16525fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:14:19 +0800
Subject: [PATCH] #合同审核完善
---
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 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 58bdc61..addf494 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
@@ -8,6 +8,10 @@
import com.zy.crm.manager.service.OrderService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
@@ -17,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
@@ -39,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){
@@ -58,4 +62,44 @@
}
}
+ @Override
+ public Double selectMoneyByYearAndStatus(String year, Integer status) {
+ Double data = this.baseMapper.selectMoneyByYearAndStatus(year, status);
+ if (data == null) {
+ return 0D;
+ }
+ return data;
+ }
+
+ @Override
+ public Double selectMoneyByUserAndYearAndStatus(Long userId, String year, Integer status) {
+ Double data = this.baseMapper.selectMoneyByUserAndYearAndStatus(userId, year, status);
+ if (data == null) {
+ return 0D;
+ }
+ return data;
+ }
+
+ @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();
+ }
+
+ @Override
+ public List<Double> selectCurrentYearMonthSuccess() {
+ ArrayList<Double> list = new ArrayList<Double>(){{
+ add(0D);add(0D);add(0D);add(0D);
+ add(0D);add(0D);add(0D);add(0D);
+ add(0D);add(0D);add(0D);add(0D);
+ }};
+ for (HashMap<String, Object> map : this.baseMapper.selectCurrentYearMonthSuccess()) {
+ list.set(Integer.parseInt(map.get("mon").toString()) - 1, Double.parseDouble(map.get("money").toString()));
+ }
+ return list;
+ }
}
--
Gitblit v1.9.1