From a99200c20a02f14b3f3560d24d6a9b624478d74a Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 22 五月 2023 16:20:11 +0800
Subject: [PATCH] 领导层调用应用层接口加userId
---
src/main/java/com/whyc/service/BattdischargePlanService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattdischargePlanService.java b/src/main/java/com/whyc/service/BattdischargePlanService.java
index 812bced..efaf0f3 100644
--- a/src/main/java/com/whyc/service/BattdischargePlanService.java
+++ b/src/main/java/com/whyc/service/BattdischargePlanService.java
@@ -425,21 +425,21 @@
int userId = ActionUtil.getUser().getUId().intValue();
Map<String,Integer> map = new HashMap<>();
int year = Calendar.getInstance().get(Calendar.YEAR);
- List<BattdischargePlan> planList = mapper.getPlanCount(userId,year);
+ List<BattdischargePlan> planList = mapper.getPlanCount(userId, year);
//鎬绘暟,宸插畬鎴愭暟閲�
int total = planList.size();
int finishNum = planList.stream().filter(plan -> plan.getDischargeState() == 2).collect(Collectors.toList()).size();
- map.put("total",total);
- map.put("finishNum",finishNum);
- return new Response().set(1,map);
+ map.put("total", total);
+ map.put("finishNum", finishNum);
+ return new Response().set(1, map);
}
- public Map<String,Map<String,Integer>> getPlanCount() {
- int userId = ActionUtil.getUser().getUId().intValue();
- Map<String,Map<String,Integer>> resMap = new HashMap<>();
- Map<String,Integer> map = new HashMap<>();
+ public Map<String, Map<String, Integer>> getPlanCount(int userId) {
+ //int userId = ActionUtil.getUser().getUId().intValue();
+ Map<String, Map<String, Integer>> resMap = new HashMap<>();
+ Map<String, Integer> map = new HashMap<>();
int year = Calendar.getInstance().get(Calendar.YEAR);
- List<BattdischargePlan> planList = mapper.getPlanCount(userId,year);
+ List<BattdischargePlan> planList = mapper.getPlanCount(userId, year);
//鐝粍,鎬绘暟,宸插畬鎴愭暟閲�
Map<String, List<BattdischargePlan>> groupNameListMap = planList.stream().collect(Collectors.groupingBy(BattdischargePlan::getBaojiGroupName));
Set<String> groupNameSet = groupNameListMap.keySet();
@@ -447,27 +447,27 @@
List<BattdischargePlan> plans = groupNameListMap.get(groupName);
int total = plans.size();
int finishNum = plans.stream().filter(plan -> plan.getDischargeState() == 2).collect(Collectors.toList()).size();
- map.put("total",total);
- map.put("finishNum",finishNum);
+ map.put("total", total);
+ map.put("finishNum", finishNum);
- resMap.put(groupName,map);
+ resMap.put(groupName, map);
}
return resMap;
}
- public Response getPlanCountWithTotal() {
- Map<String,Integer> resMap = new HashMap<>();
- resMap.put("鏀剧數浠诲姟鎬绘暟",0);
+ public Response getPlanCountWithTotal(int userId) {
+ Map<String, Integer> resMap = new HashMap<>();
+ resMap.put("鏀剧數浠诲姟鎬绘暟", 0);
int total = 0;
- Map<String, Map<String, Integer>> planCount = getPlanCount();
+ Map<String, Map<String, Integer>> planCount = getPlanCount(userId);
Set<String> groupNameSet = planCount.keySet();
for (String groupName : groupNameSet) {
//resMap.put(groupName,planCount.get(groupName).get("finishNum"));
total = total + planCount.get(groupName).get("total");
}
- resMap.put("鏀剧數浠诲姟鎬绘暟",total);
- return new Response().setII(1,resMap,planCount,null);
+ resMap.put("鏀剧數浠诲姟鎬绘暟", total);
+ return new Response().setII(1, resMap, planCount, null);
}
}
--
Gitblit v1.9.1