From 611c07cb01f6c09739ff94c529069c9fc19b4cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 3 Nov 2020 16:03:59 +0800 Subject: [PATCH] fix --- .../controller/ChartController.java | 11 ++++++++++- .../performance/req/AssessDetailReq.java | 2 ++ .../modules/performance/req/AssessListReq.java | 2 +- .../performance/req/ChartResultReq.java | 2 +- .../service/impl/AssessManagerServiceImpl.java | 3 ++- .../service/impl/ChartResultServiceImpl.java | 18 ++++++++++++------ .../mapper/app/ResultRecordMapper.xml | 11 +++++++++-- 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 78cfc9c7..26f33562 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -1,5 +1,6 @@ package com.lz.modules.performance.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; @@ -42,7 +43,8 @@ public class ChartController extends AbstractController{ public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){ List chartStatisticalRes = null; try { - Long userId = getUserId(); + //Long userId = getUserId(); + Long userId = 313L; chartStatisticalRes = chartResultService.chartReport(startId,userId); } catch (Exception e) { log.error("获取绩效报表统计异常" ,e); @@ -83,5 +85,12 @@ public class ChartController extends AbstractController{ + @PostMapping("chart/test") + public R chartTest(){ + List starts = flowStartMapper.selectList(new QueryWrapper().in("group_ids", Collections.EMPTY_LIST)); + System.out.println(); + return null; + } + } diff --git a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java index 1d478e8e..3f2ca943 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessDetailReq.java @@ -33,4 +33,6 @@ public class AssessDetailReq extends BasePage{ private Integer flowProcess; private List departmentIds; + + private Long loginUserId; } diff --git a/src/main/java/com/lz/modules/performance/req/AssessListReq.java b/src/main/java/com/lz/modules/performance/req/AssessListReq.java index 4626259f..efb66175 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessListReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessListReq.java @@ -21,6 +21,6 @@ public class AssessListReq extends BasePage { @ApiModelProperty(value = "考核名称",name = "name") private String name; - private Long staffId; + private Long loginUserId; } diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index b848ea53..fa1941b9 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -23,6 +23,6 @@ public class ChartResultReq extends BasePage{ @ApiModelProperty(value = "等级",name = "scoreLevel") private Long scoreLevel; - private Long staffId; + private Long loginUserId; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index def09c4c..3850dab3 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -88,7 +88,8 @@ public class AssessManagerServiceImpl implements AssessManagerService { log.info("未找到考核发起数据"); return pageUtils; } - List mandepartmentIds = assessService.roleDepartments(req.getStaffId()); + //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); + List mandepartmentIds = Collections.EMPTY_LIST; list.forEach(flowStart -> { AssessManagerListRes res = new AssessManagerListRes(); String name = flowStart.getName(); diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 4490f275..2b87921d 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -86,7 +86,8 @@ public class ChartResultServiceImpl implements ChartResultService { } } //自己管理的部门 - List mandepartmentIds = assessService.roleDepartments(staffId); + //List mandepartmentIds = assessService.roleDepartments(staffId); + List mandepartmentIds = Collections.EMPTY_LIST; List data = new ArrayList<>(); ChartStatisticalRes res; @@ -94,7 +95,7 @@ public class ChartResultServiceImpl implements ChartResultService { res = new ChartStatisticalRes(); res.setType(0); - res.setStatisticals(buildProcess(process,startId)); + res.setStatisticals(buildProcess(process,startId,mandepartmentIds)); res.setDefaultTime(defaultTime); if(StringUtil.isNotBlank(defaultTime)){ res.setDefaultId(startId); @@ -180,7 +181,8 @@ public class ChartResultServiceImpl implements ChartResultService { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); //自己管理的和所有的部门交集 log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds)); - List mandepartmentIds = assessService.roleDepartments(req.getStaffId()); + //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); + List mandepartmentIds = Collections.EMPTY_LIST; log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds)); mandepartmentIds.retainAll(allDeparmentIds); log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds)); @@ -220,17 +222,21 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public List countAssessNumByFlowProcess(AssessDetailReq req) { List process = resultRecordMapper.countAssessNumByFlowProcess(req); - List data = buildProcess(process, req.getStartId()); + //获取自己管理的部门 + //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); + List mandepartmentIds = Collections.EMPTY_LIST; + List data = buildProcess(process, req.getStartId(),mandepartmentIds); return data; } //构建流程默认人数 - private List buildProcess(List process,Long startId){ + private List buildProcess(List process,Long startId,List mandepartmentIds){ List data = new ArrayList<>(); Map map = Maps.newHashMap(); int count = resultRecordService.count(new QueryWrapper() .eq("is_delete", 0) - .eq("start_id", startId)); + .eq("start_id", startId) + .in("department_id",mandepartmentIds)); ChartStatistical all = new ChartStatistical(); all.setDesc("参与人数"); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 353c9c7a..e59dd064 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -459,6 +459,13 @@ ) + + and r.department_id in ( + + #{department_id} + + ) +