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 339aef54..cd81fff6 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -7,6 +7,7 @@ import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.service.FlowStartService; +import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.req.ChartStartsReq; import com.lz.modules.performance.res.ChartStartsRes; import com.lz.modules.performance.res.ChartStatisticalRes; @@ -62,13 +63,13 @@ public class ChartController extends AbstractController{ } - /*@PostMapping("chart/rank") + @PostMapping("chart/rank") @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); 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 new file mode 100644 index 00000000..53fd7a4d --- /dev/null +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -0,0 +1,15 @@ +package com.lz.modules.performance.req; + +import com.lz.modules.equipment.entity.model.BasePage; +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/27 16:05 + */ +@Data +public class ChartResultReq extends BasePage{ + + private Long departmentId; +} 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 99632b61..4bb29414 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -3,6 +3,7 @@ package com.lz.modules.performance.service; import com.lz.common.utils.PageUtils; import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.req.ChartStartsReq; import com.lz.modules.performance.res.ChartStartsRes; import com.lz.modules.performance.res.ChartStatistical; @@ -21,7 +22,7 @@ public interface ChartResultService { List countDepartmentAndStaffNum(ListstaffIds); - //PageUtils resultRankList(ChartResultReq req); + PageUtils resultRankList(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 4c7dd0f9..f3ce8d51 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 @@ -15,6 +15,7 @@ import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowStartService; import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.req.AssessDetailReq; +import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.req.ChartStartsReq; import com.lz.modules.performance.res.ChartStartsRes; import com.lz.modules.performance.res.ChartStatistical; @@ -133,13 +134,14 @@ public class ChartResultServiceImpl implements ChartResultService { return data; } - /* @Override + @Override public PageUtils resultRankList(ChartResultReq req) { + List ids = staffService.staffsByAllDeparmentIds(Arrays.asList(req.getDepartmentId() + StringUtil.EMPTY)); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( - page -> resultRecordMapper.selectResultRankList(page,req) + page -> resultRecordMapper.selectResultRankList(page,ids) ); return pageUtils; - }*/ + } @Override public PageUtils chartStarts(ChartStartsReq req) { 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 7e788d16..d39ab181 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("req") ChartResultReq req); + List selectResultRankList(@Param("page") IPage page, @Param("staffIds") List staffIds); 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 a7388485..77873847 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -388,7 +388,7 @@ ON r.start_id = s.start_id and r.staff_id = s.staff_id where r.is_delete = 0 and s.is_delete = 0 and r.start_id = #{req.startId} - + and r.evaluation_id in( #{evaluation_id} @@ -401,7 +401,7 @@ and r.staff_name LIKE CONCAT('%',#{req.staffName},'%') - + and r.staff_id in( #{staff_id} @@ -414,7 +414,7 @@ SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0 and start_id =#{req.startId} - + and r.evaluation_id in( #{evaluation_id} @@ -427,7 +427,7 @@ and r.staff_name LIKE CONCAT('%',#{req.staffName},'%') - + and r.staff_id in( #{staff_id}