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 cd81fff6..6d84c551 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -63,11 +63,11 @@ public class ChartController extends AbstractController{ } - @PostMapping("chart/rank") - @ApiOperation("获取绩排名列表") + @PostMapping("chart/detail") + @ApiOperation("获取报表等级详情") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)}) - public R rankList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ - PageUtils pageUtils = chartResultService.resultRankList(req); + public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ + PageUtils pageUtils = chartResultService.selectChartDetailList(req); return R.ok().put("data",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index 53fd7a4d..479b363c 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -1,6 +1,8 @@ package com.lz.modules.performance.req; import com.lz.modules.equipment.entity.model.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,7 +11,12 @@ import lombok.Data; * @Date: 2020/10/27 16:05 */ @Data +@ApiModel("获取报表等级详情实体") public class ChartResultReq extends BasePage{ - private Long departmentId; + @ApiModelProperty(value = "部门id",name = "departmentId") + private String departmentId; + + @ApiModelProperty(value = "考核id",name = "startId") + private Long startId; } diff --git a/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java b/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java index 610c3004..2a1e8a5a 100644 --- a/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java +++ b/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java @@ -26,10 +26,7 @@ public class ResultRankListRes { private String scoreLevel; //绩效结果 @ApiModelProperty(value = "绩效结果",name = "result") - private String result; - //绩效排名 - @ApiModelProperty(value = "绩效排名",name = "rank") - private String rank; + private String allScore; @ApiModelProperty(value = "id",name = "recordId") private Long recordId; } 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 4bb29414..0e309d81 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -22,7 +22,7 @@ public interface ChartResultService { List countDepartmentAndStaffNum(ListstaffIds); - PageUtils resultRankList(ChartResultReq req); + PageUtils selectChartDetailList(ChartResultReq req); PageUtils chartStarts(ChartStartsReq req); 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 f3ce8d51..62e22f27 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 @@ -135,10 +135,11 @@ public class ChartResultServiceImpl implements ChartResultService { } @Override - public PageUtils resultRankList(ChartResultReq req) { - List ids = staffService.staffsByAllDeparmentIds(Arrays.asList(req.getDepartmentId() + StringUtil.EMPTY)); + public PageUtils selectChartDetailList(ChartResultReq req) { + List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); + List ids = staffService.staffsByAllDeparmentIds(allDeparmentIds); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( - page -> resultRecordMapper.selectResultRankList(page,ids) + page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId()) ); return pageUtils; } 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 d39ab181..39457fce 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 @@ -77,7 +77,7 @@ public interface ResultRecordMapper extends BaseMapper { List countNumByScoreLevel(@Param("startId") Long startId); - List selectResultRankList(@Param("page") IPage page, @Param("staffIds") List staffIds); + List selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId); void batchDeleteByStartId(@Param("startId")Long startId); diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 67b67ce9..287d2d3f 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -360,11 +360,20 @@ SELECT count(score_level) num,case score_level WHEN 0 THEN '无等级' ELSE score_level END as 'desc' from lz_result_record where is_delete=0 and start_id =#{startId} GROUP BY score_level - + SELECT r.id recordId,all_score,department_name,staff_name,score_level,job_number staffNo from lz_result_record r LEFT JOIN lz_staff s on r.staff_id = s.id - where r.is_delete =0 and s.is_delete=0 ORDER BY all_score desc + where r.is_delete =0 and s.is_delete=0 + and r.start_id = #{startId} + + and r.staff_id in ( + + #{staff_id} + + ) + + ORDER BY all_score desc