wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
杜建超 2020-10-16 16:12:08 +08:00
parent 224f5f9f6c
commit c62df55daf
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/controller/ChartController.java
View File

@ -31,8 +31,6 @@ import java.util.Optional;
public class ChartController extends AbstractController{ public class ChartController extends AbstractController{
@Autowired @Autowired
private ChartResultService chartResultService; private ChartResultService chartResultService;
@Autowired
private EvaluationGroupService evaluationGroupService;
@PostMapping("chart/result") @PostMapping("chart/result")
@ApiOperation("获取绩效报表统计") @ApiOperation("获取绩效报表统计")
@ -40,8 +38,6 @@ public class ChartController extends AbstractController{
public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){
List<ChartStatisticalRes> data = new ArrayList<>(); List<ChartStatisticalRes> data = new ArrayList<>();
chartResultService.chartReport(req); chartResultService.chartReport(req);
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L);
return R.ok(); return R.ok();
} }

1
src/main/java/com/lz/modules/performance/service/ChartResultService.java
View File

@ -4,6 +4,7 @@ import com.lz.modules.performance.req.ChartResultReq;
import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatistical;
import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.ChartStatisticalRes;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**

9
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

@ -5,6 +5,8 @@ import com.google.common.collect.Maps;
import com.lz.common.utils.StringUtil; import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.service.DepartmentsStaffRelateService; 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.AssessListReq;
import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.req.ChartResultReq;
import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatistical;
@ -26,15 +28,22 @@ import java.util.*;
*/ */
@Service("chartResultService") @Service("chartResultService")
public class ChartResultServiceImpl implements ChartResultService { public class ChartResultServiceImpl implements ChartResultService {
@Autowired @Autowired
private ResultRecordService resultRecordService; private ResultRecordService resultRecordService;
@Autowired @Autowired
private DepartmentsStaffRelateService departmentsStaffRelateService; private DepartmentsStaffRelateService departmentsStaffRelateService;
@Autowired
private EvaluationGroupService evaluationGroupService;
@Override @Override
public void chartReport(ChartResultReq req) { public void chartReport(ChartResultReq req) {
AssessListReq query = new AssessListReq(); AssessListReq query = new AssessListReq();
BeanUtils.copyProperties(req,query); BeanUtils.copyProperties(req,query);
List<ChartStatisticalRes> chartStatisticalRes = resultRecordService.countNumByFlowProcess(query); List<ChartStatisticalRes> chartStatisticalRes = resultRecordService.countNumByFlowProcess(query);
List<ChartStatisticalRes> chartStatisticalRes1 = resultRecordService.countNumByScoreLevel(query);
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L);
List<ChartStatistical> chartStatisticals = this.countDepartmentAndStaffNum(strings);
} }