From 02510f9ee65ec84b162112209d458a13acb1cee7 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, 27 Oct 2020 11:45:25 +0800 Subject: [PATCH] fix --- .../performance/controller/AssessManagerController.java | 5 +++-- .../performance/service/impl/ChartResultServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index c62a2319..92e11f01 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -11,6 +11,7 @@ import com.lz.modules.performance.res.AssessManagerListRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.service.AssessManagerService; +import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; @@ -36,7 +37,7 @@ public class AssessManagerController { @Autowired private ResultRecordMapper resultRecordMapper; @Autowired - private ResultRecordService resultRecordService; + private ChartResultService chartResultService; @PostMapping("assess/manager/list") @@ -68,7 +69,7 @@ public class AssessManagerController { if(req.getStartId()==null){ return R.error("考核id不能为空"); } - List process = resultRecordService.countAssessNumByFlowProcess(req); + List process = chartResultService.countAssessNumByFlowProcess(req); return R.ok().put("data",process); } 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 7410d584..cb2d9b91 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 @@ -158,9 +158,9 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public List countAssessNumByFlowProcess(AssessDetailReq req) { - resultRecordMapper.countAssessNumByFlowProcess(req); - - return null; + List process = resultRecordMapper.countAssessNumByFlowProcess(req); + List data = buildProcess(process, req.getStartId()); + return data; } //构建流程默认人数