From 53812d9e3d8700d41163ef9eed322b41df3e93f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 16 Oct 2020 15:10:03 +0800 Subject: [PATCH] fix --- .../com/lz/modules/flow/service/EvaluationGroupService.java | 2 +- .../flow/service/impl/EvaluationGroupServiceImpl.java | 2 +- .../lz/modules/performance/controller/ChartController.java | 3 ++- .../lz/modules/performance/service/ChartResultService.java | 6 ++++++ .../performance/service/impl/ChartResultServiceImpl.java | 5 +++++ .../java/com/lz/modules/sys/dao/app/ResultRecordMapper.java | 2 ++ .../com/lz/modules/sys/service/app/ResultRecordService.java | 2 ++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 5 +++++ src/main/resources/mapper/app/ResultRecordMapper.xml | 3 +++ 9 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index 3a8a7278..e1f94c07 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java @@ -32,7 +32,7 @@ public interface EvaluationGroupService extends IService { int deleteEvaluationGroupById(Long id); //获取参与考核的所有人员 - List selectAllStaffIdsById(Long id); + List selectAllStaffIdsByGroupId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 1ade5a03..5dd0e86d 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -66,7 +66,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl selectAllStaffIdsById(Long id) { + public List selectAllStaffIdsByGroupId(Long id) { EvaluationGroup evaluationGroup = this.selectEvaluationGroupById(id); String depIds = evaluationGroup.getDepIds(); Set allDeparmentIds = new HashSet<>(); 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 ffe0e52e..957b1055 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -40,7 +40,8 @@ public class ChartController extends AbstractController{ public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ List data = new ArrayList<>(); chartResultService.chartReport(req); - EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(1L); + List strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L); + return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/service/ChartResultService.java b/src/main/java/com/lz/modules/performance/service/ChartResultService.java index 29974992..85bd649d 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -2,11 +2,17 @@ package com.lz.modules.performance.service; import com.lz.modules.performance.req.ChartResultReq; +import java.util.List; + /** * @Author: djc * @Desc: * @Date: 2020/10/14 16:52 */ public interface ChartResultService { + void chartReport(ChartResultReq req); + + void chartDepartment(ListstaffIds); + } 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 e321f8d2..347aab28 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 @@ -27,5 +27,10 @@ public class ChartResultServiceImpl implements ChartResultService { List chartStatisticalRes = resultRecordService.countNumByFlowProcess(query); + } + + @Override + public void chartDepartment(List staffIds) { + } } diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index cca8b1f0..e2c133e4 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -74,4 +74,6 @@ public interface ResultRecordMapper extends BaseMapper { List countNumByFlowProcess(@Param("req") AssessListReq req); + List countNumByScoreLevel(@Param("req") AssessListReq req); + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 0033d607..b74d4633 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -104,4 +104,6 @@ public interface ResultRecordService extends IService { List selectResultRecordAllByStaffId(Long staffId); List countNumByFlowProcess(AssessListReq req); + + List countNumByScoreLevel(AssessListReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index d588ddc7..5f23a29c 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -736,4 +736,9 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(AssessListReq req) { return resultRecordMapper.countNumByFlowProcess(req); } + + @Override + public List countNumByScoreLevel(AssessListReq req) { + return resultRecordMapper.countNumByScoreLevel(req); + } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 472708c1..54fbe77c 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -341,6 +341,9 @@ +