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 957b1055..0606d6a3 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -31,8 +31,6 @@ import java.util.Optional; public class ChartController extends AbstractController{ @Autowired private ChartResultService chartResultService; - @Autowired - private EvaluationGroupService evaluationGroupService; @PostMapping("chart/result") @ApiOperation("获取绩效报表统计") @@ -40,8 +38,6 @@ 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); - 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 d1ede77c..2414d5a4 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -4,6 +4,7 @@ import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; +import java.math.BigDecimal; import java.util.List; /** 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 cf5cf14f..afee33af 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 @@ -5,6 +5,8 @@ import com.google.common.collect.Maps; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.service.DepartmentsStaffRelateService; +import com.lz.modules.flow.entity.EvaluationGroup; +import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatistical; @@ -26,15 +28,22 @@ import java.util.*; */ @Service("chartResultService") public class ChartResultServiceImpl implements ChartResultService { + @Autowired private ResultRecordService resultRecordService; @Autowired private DepartmentsStaffRelateService departmentsStaffRelateService; + @Autowired + private EvaluationGroupService evaluationGroupService; + @Override public void chartReport(ChartResultReq req) { AssessListReq query = new AssessListReq(); BeanUtils.copyProperties(req,query); List chartStatisticalRes = resultRecordService.countNumByFlowProcess(query); + List chartStatisticalRes1 = resultRecordService.countNumByScoreLevel(query); + List strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L); + List chartStatisticals = this.countDepartmentAndStaffNum(strings); }