From 2a6d4444dfcaf6f87960d4b61cab43615fadfb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 16 Oct 2020 16:35:19 +0800 Subject: [PATCH] fix --- .../controller/ChartController.java | 6 ++---- .../performance/res/ChartStatisticalRes.java | 2 +- .../service/ChartResultService.java | 2 +- .../service/impl/ChartResultServiceImpl.java | 21 ++++++++++++++----- .../sys/dao/app/ResultRecordMapper.java | 5 +++-- .../sys/service/app/ResultRecordService.java | 5 +++-- .../app/impl/ResultRecordServiceImpl.java | 5 +++-- .../mapper/app/ResultRecordMapper.xml | 4 ++-- 8 files changed, 31 insertions(+), 19 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 0606d6a3..ddd7d238 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -36,10 +36,8 @@ public class ChartController extends AbstractController{ @ApiOperation("获取绩效报表统计") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ - List data = new ArrayList<>(); - chartResultService.chartReport(req); - - return R.ok(); + List chartStatisticalRes = chartResultService.chartReport(req); + return R.ok().put("data",chartStatisticalRes); } diff --git a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java index 4e744222..8e673c68 100644 --- a/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java +++ b/src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java @@ -14,7 +14,7 @@ import java.util.List; @Data @ApiModel(value = "绩效报表统计实体") public class ChartStatisticalRes { - @ApiModelProperty(value = "类型 0：节点统计 1：人数统计 2：等级统计",name = "type") + @ApiModelProperty(value = "类型 0：节点统计 1：等级统计 2:人数统计 ",name = "type") private int type; private List data; 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 2414d5a4..fd17174c 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -14,7 +14,7 @@ import java.util.List; */ public interface ChartResultService { - void chartReport(ChartResultReq req); + List chartReport(ChartResultReq req); List countDepartmentAndStaffNum(ListstaffIds); 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 afee33af..18db8af8 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 @@ -37,14 +37,25 @@ public class ChartResultServiceImpl implements ChartResultService { private EvaluationGroupService evaluationGroupService; @Override - public void chartReport(ChartResultReq req) { + public List chartReport(ChartResultReq req) { + List data = new ArrayList<>(); AssessListReq query = new AssessListReq(); + ChartStatisticalRes res = null; BeanUtils.copyProperties(req,query); - List chartStatisticalRes = resultRecordService.countNumByFlowProcess(query); - List chartStatisticalRes1 = resultRecordService.countNumByScoreLevel(query); + List process = resultRecordService.countNumByFlowProcess(query); + res = new ChartStatisticalRes(); + res.setType(0); + res.setData(process); + List scoreLevel = resultRecordService.countNumByScoreLevel(query); + res = new ChartStatisticalRes(); + res.setType(1); + res.setData(scoreLevel); List strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L); - List chartStatisticals = this.countDepartmentAndStaffNum(strings); - + List depstaff = this.countDepartmentAndStaffNum(strings); + res = new ChartStatisticalRes(); + res.setType(2); + res.setData(depstaff); + return data; } 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 e2c133e4..7f6657ac 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 @@ -17,6 +17,7 @@ import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; @@ -72,8 +73,8 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordAllByStaffId(@Param("staffId") Long staffId); - List countNumByFlowProcess(@Param("req") AssessListReq req); + List countNumByFlowProcess(@Param("req") AssessListReq req); - List countNumByScoreLevel(@Param("req") AssessListReq req); + List countNumByScoreLevel(@Param("req") AssessListReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index b74d4633..935a74ea 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -15,6 +15,7 @@ import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.flow.entity.Flow; import com.lz.modules.flow.model.StaffRoleDto; import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; @@ -103,7 +104,7 @@ public interface ResultRecordService extends IService { List selectResultRecordAllByStaffId(Long staffId); - List countNumByFlowProcess(AssessListReq req); + List countNumByFlowProcess(AssessListReq req); - List countNumByScoreLevel(AssessListReq req); + List countNumByScoreLevel(AssessListReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 5f23a29c..e76f8a71 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -28,6 +28,7 @@ import com.lz.modules.flow.model.TypeRoleDto; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.SysUserEntity; @@ -733,12 +734,12 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(AssessListReq req) { + public List countNumByFlowProcess(AssessListReq req) { return resultRecordMapper.countNumByFlowProcess(req); } @Override - public List countNumByScoreLevel(AssessListReq req) { + public List countNumByScoreLevel(AssessListReq req) { return resultRecordMapper.countNumByScoreLevel(req); } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 54fbe77c..7055b659 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -338,10 +338,10 @@ select * from lz_result_record where staff_id = #{staffId} - SELECT count(flow_process) num,flow_process type from lz_result_record where is_delete=0 GROUP BY flow_process -