From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
index 56f66a0..3ea8d2f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
@@ -23,10 +23,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* <p>
@@ -57,8 +54,8 @@
// 开始，结束时间
if(StringUtils.hasLength(businessTime)){
String[] split = businessTime.split(" - ");
- startTime = split[0];
- endTime = split[1];
+ startTime = split[0] + " 00:00:00";
+ endTime = split[1] + " 23:59:59";
}
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
@@ -132,7 +129,7 @@
}
@Override
- public void getDataStatisticsIncomeOrCommission(Integer agentId, String monthDate, Integer type, Model model) {
+ public void getDataStatisticsIncomeOrCommission(Integer agentId, String monthDate, Integer type, Model model, Map<String, Object> map) {
List<PerformanceTableResp> list = new ArrayList<>();
if(2 == type){
list = tRevenueMapper.getDataStatisticsIncomeOrCommission(agentId,1,monthDate);
@@ -141,5 +138,19 @@
list = tRevenueMapper.getDataStatisticsIncomeOrCommission(agentId,2,monthDate);
}
model.addAttribute("performanceResp",list);
+ map.put("performanceResp",list);
+ }
+
+ @Override
+ public void getDataStatisticsIncomeOrCommissionByIds(List<Integer> ids, String monthDate, Integer type, Model model, Map<String, Object> map) {
+ List<PerformanceTableResp> list = new ArrayList<>();
+ if(2 == type){
+ list = tRevenueMapper.getDataStatisticsIncomeOrCommissionByIds(ids,1,monthDate);
+ }
+ if (3 == type){
+ list = tRevenueMapper.getDataStatisticsIncomeOrCommissionByIds(ids,2,monthDate);
+ }
+ model.addAttribute("performanceResp",list);
+ map.put("performanceResp",list);
}
}
--
Gitblit v1.7.1