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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-12 19:37:41 +08:00
commit df46dd588e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class ChartController extends AbstractController{
@ApiOperation("获取绩效报表统计") @ApiOperation("获取绩效报表统计")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)})
public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){ public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){
List<ChartStatisticalRes> chartStatisticalRes = null; List<ChartStatisticalRes> chartStatisticalRes;
try { try {
Long userId = getUserId(); Long userId = getUserId();
chartStatisticalRes = chartResultService.chartReport(startId,userId); chartStatisticalRes = chartResultService.chartReport(startId,userId);

2
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -379,7 +379,7 @@
</select> </select>
<select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical"> <select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical">
SELECT count(score_level) num,score_level,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0 SELECT count(1) num,score_level,case score_level is null WHEN true THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0
and start_id =#{startId} and start_id =#{startId}
<if test="evaluationIds !=null and evaluationIds.size()!=0"> <if test="evaluationIds !=null and evaluationIds.size()!=0">
and evaluation_id in ( and evaluation_id in (