From 0df78fc7a3223f4f4927b498162a6abd8d39c52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 27 Oct 2020 16:20:12 +0800 Subject: [PATCH 1/4] fix --- .../performance/controller/ChartController.java | 5 +++-- .../modules/performance/req/ChartResultReq.java | 15 +++++++++++++++ .../performance/service/ChartResultService.java | 3 ++- .../service/impl/ChartResultServiceImpl.java | 8 +++++--- .../modules/sys/dao/app/ResultRecordMapper.java | 2 +- .../resources/mapper/app/ResultRecordMapper.xml | 8 ++++---- 6 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/req/ChartResultReq.java 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} From 5a9e697deb43beec0aa3d7d92c954b6a61d56e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 27 Oct 2020 16:21:25 +0800 Subject: [PATCH 2/4] fix --- src/main/resources/mapper/app/ResultRecordMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 77873847..67b67ce9 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -415,20 +415,20 @@ where is_delete=0 and start_id =#{req.startId} - and r.evaluation_id in( + and evaluation_id in( #{evaluation_id} ) - and r.flow_process = #{req.flowProcess} + and flow_process = #{req.flowProcess} - and r.staff_name LIKE CONCAT('%',#{req.staffName},'%') + and staff_name LIKE CONCAT('%',#{req.staffName},'%') - and r.staff_id in( + and staff_id in( #{staff_id} From 82bfc20cd4fa6b238af46b814fc21ce7fbeea9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 27 Oct 2020 16:45:40 +0800 Subject: [PATCH 3/4] fiz --- .../performance/controller/ChartController.java | 8 ++++---- .../modules/performance/req/ChartResultReq.java | 9 ++++++++- .../performance/res/ResultRankListRes.java | 5 +---- .../performance/service/ChartResultService.java | 2 +- .../service/impl/ChartResultServiceImpl.java | 7 ++++--- .../modules/sys/dao/app/ResultRecordMapper.java | 2 +- .../resources/mapper/app/ResultRecordMapper.xml | 15 ++++++++++++--- 7 files changed, 31 insertions(+), 17 deletions(-) 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 From 3e496962b1029596b0607c1f4f193fc8414ccb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 27 Oct 2020 17:04:15 +0800 Subject: [PATCH 4/4] fix --- .../com/lz/modules/performance/req/ChartResultReq.java | 3 +++ .../com/lz/modules/performance/res/ChartStatistical.java | 3 +++ .../performance/service/impl/ChartResultServiceImpl.java | 7 +++++-- .../com/lz/modules/sys/dao/app/ResultRecordMapper.java | 2 +- src/main/resources/mapper/app/ResultRecordMapper.xml | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-) 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 479b363c..5d49ac0c 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -19,4 +19,7 @@ public class ChartResultReq extends BasePage{ @ApiModelProperty(value = "考核id",name = "startId") private Long startId; + + @ApiModelProperty(value = "状态",name = "flowProcess") + private Long flowProcess; } diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java index 6a6e8211..a894bc68 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatistical.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatistical.java @@ -14,4 +14,7 @@ public class ChartStatistical { @ApiModelProperty(value = "人数",name = "num") private int num = 0; + + @ApiModelProperty(value = "状态",name = "flowProcess") + private Long flowProcess; } \ No newline at end of file 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 62e22f27..9a2a18f2 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 @@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.function.Consumer; /** * @Author: djc @@ -139,7 +138,7 @@ public class ChartResultServiceImpl implements ChartResultService { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); List ids = staffService.staffsByAllDeparmentIds(allDeparmentIds); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( - page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId()) + page -> resultRecordMapper.selectChartDetailList(page,ids,req.getStartId(),req.getFlowProcess()) ); return pageUtils; } @@ -197,6 +196,7 @@ public class ChartResultServiceImpl implements ChartResultService { ChartStatistical statistical = new ChartStatistical(); statistical.setDesc(flowProcessEnum.getDesc()); statistical.setNum(0); + statistical.setFlowProcess(Long.valueOf(flowProcessEnum.getStatus())); Object o = map.get(flowProcessEnum.getDesc()); if(o!=null){ statistical.setNum(Integer.valueOf(o.toString())); @@ -206,6 +206,9 @@ public class ChartResultServiceImpl implements ChartResultService { return data; } + + + private List buildDepStaffs(List depStaffs){ depStaffs.stream().forEach(chartStatistical -> { String desc = chartStatistical.getDesc(); 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 39457fce..8cb6a4de 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 selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId); + List selectChartDetailList(@Param("page") IPage page, @Param("staffIds") List staffIds, @Param("startId")Long startId,@Param("flowProcess")Long flowProcess); 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 287d2d3f..0875ce92 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -373,6 +373,9 @@ ) + + and r.flow_process = #{flowProcess} + ORDER BY all_score desc