src/main/java/com/whyc/controller/BattdischargePlanController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/KPIController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattdischargePlanService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/KPIService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BattdischargePlanMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/BattdischargePlanController.java
@@ -84,10 +84,16 @@ return service.getDischargePlanFinishTime(); } @ApiOperation("获取年度放电任务统计") @ApiOperation("获取年度放电任务量统计-组内") @GetMapping("myPlanCount") public Response getMyPlanCount(){ return service.getMyPlanCount(); } @ApiOperation("获取年度放电任务量统计-管理") @GetMapping("planCount") public Response getPlanCount(){ return service.getPlanCount(); return service.getPlanCountWithGroupName(); } } src/main/java/com/whyc/controller/KPIController.java
New file @@ -0,0 +1,19 @@ package com.whyc.controller; import com.whyc.service.KPIService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * 绩效考核 */ @RequestMapping("kpi") @RestController @Api(tags = "项目绩效考核") public class KPIController { private KPIService service; } src/main/java/com/whyc/service/BattdischargePlanService.java
@@ -421,11 +421,51 @@ } public Response getPlanCount() { public Response getMyPlanCount() { int userId = ActionUtil.getUser().getUId().intValue(); Map<String,Integer> map = new HashMap<>(); List<BattdischargePlan> planList = mapper.getPlanCount(userId); //总数,已完成数量 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); } 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<>(); List<BattdischargePlan> planList = mapper.getPlanCount(userId); //班组,总数,已完成数量 Map<String, List<BattdischargePlan>> groupNameListMap = planList.stream().collect(Collectors.groupingBy(BattdischargePlan::getBaojiGroupName)); Set<String> groupNameSet = groupNameListMap.keySet(); for (String groupName : groupNameSet) { 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); resMap.put(groupName,map); } return resMap; } public Response getPlanCountWithGroupName() { Map<String,Integer> resMap = new HashMap<>(); resMap.put("放电任务总数",0); int total = 0; Map<String, Map<String, Integer>> planCount = getPlanCount(); 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().set(1,resMap); } } src/main/java/com/whyc/service/KPIService.java
New file @@ -0,0 +1,17 @@ package com.whyc.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class KPIService { @Autowired private BattdischargePlanService planService; @Autowired private FaultUploadService uploadService; } src/main/resources/mapper/BattdischargePlanMapper.xml
@@ -168,7 +168,18 @@ where p.battgroupid = b.battGroupId and p.baoji_group_id = g.baoji_group_id </select> <select id="getPlanCount" resultType="com.whyc.pojo.BattdischargePlan"> SELECT baoJiGroup.baoji_group_name,plan.* FROM web_site.tb_battdischarge_plan plan, db_user.tb_user_battgroup_baojigroup_battgroup baoJiGroupBattGroup, db_user.tb_user_battgroup_baojigroup baoJiGroup, db_user.tb_user_battgroup_baojigroup_usr baoJiGroupUser WHERE plan.battgroupid = baoJiGroupBattGroup.BattGroupId AND baoJiGroupBattGroup.baoji_group_id = baoJiGroup.baoji_group_id AND baoJiGroupBattGroup.baoji_group_id = baoJiGroupUser.baoji_group_id AND baoJiGroupUser.uId = #{userId} </select> </mapper>