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-27 16:20:12 +08:00
parent fcf9ec460b
commit 0df78fc7a3
6 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}*/
}

15
src/main/java/com/lz/modules/performance/req/ChartResultReq.java Normal file
View File

@ -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;
}

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

@ -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<ChartStatistical> countDepartmentAndStaffNum(List<String>staffIds);
//PageUtils resultRankList(ChartResultReq req);
PageUtils resultRankList(ChartResultReq req);
PageUtils chartStarts(ChartStartsReq req);

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

@ -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<String> 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) {

2
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -77,7 +77,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
List<ChartStatistical> countNumByScoreLevel(@Param("startId") Long startId);
//List<ResultRecord> selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req);
List<ResultRecord> selectResultRankList(@Param("page") IPage page, @Param("staffIds") List<String> staffIds);
void batchDeleteByStartId(@Param("startId")Long startId);

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

@ -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}
<if test="req.evaluationIds !=null and req.evaluationIds.size()!=''">
<if test="req.evaluationIds !=null and req.evaluationIds !=''">
and r.evaluation_id in(
<foreach collection="req.evaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
#{evaluation_id}
@ -401,7 +401,7 @@
<if test="req.staffName !=null and req.staffName!=''">
and r.staff_name LIKE CONCAT('%',#{req.staffName},'%')
</if>
<if test="req.staffIds !=null and req.staffIds.size() !=''">
<if test="req.staffIds !=null and req.staffIds !=''">
and r.staff_id in(
<foreach collection="req.staffIds.split(',')" item="staff_id" open="(" separator="," close=")">
#{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}
<if test="req.evaluationIds !=null and req.evaluationIds.size()!=''">
<if test="req.evaluationIds !=null and req.evaluationIds !=''">
and r.evaluation_id in(
<foreach collection="req.evaluationIds.split(',')" item="evaluation_id" open="(" separator="," close=")">
#{evaluation_id}
@ -427,7 +427,7 @@
<if test="req.staffName !=null and req.staffName!=''">
and r.staff_name LIKE CONCAT('%',#{req.staffName},'%')
</if>
<if test="req.staffIds !=null and req.staffIds.size() !=''">
<if test="req.staffIds !=null and req.staffIds !=''">
and r.staff_id in(
<foreach collection="req.staffIds.split(',')" item="staff_id" open="(" separator="," close=")">
#{staff_id}