wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-10-20 17:08:18 +08:00
commit 108deb03fc
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/lz/modules/performance/res/AssessListRes.java Normal file
View File

@ -0,0 +1,18 @@
package com.lz.modules.performance.res;
import lombok.Data;
/**
* @Author: djc
* @Desc:
* @Date: 2020/10/20 15:54
*/
@Data
public class AssessListRes {
//考核名称
private String name;
//时间周期
private String cycleTime;
//组人员
private String groupNum;
}

5
src/main/java/com/lz/modules/performance/res/ChartStatistical.java
View File

@ -3,13 +3,14 @@ package com.lz.modules.performance.res;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang.StringUtils;
@Data
@ApiModel(value = "报表统计实体")
public class ChartStatistical {
@ApiModelProperty(value = "描述",name = "desc")
private String desc;
private String desc = StringUtils.EMPTY;
@ApiModelProperty(value = "人数",name = "num")
private int num;
private int num = 0;
}

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

@ -1,5 +1,6 @@
package com.lz.modules.performance.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import com.lz.common.utils.PageUtils;
@ -52,21 +53,24 @@ public class ChartResultServiceImpl implements ChartResultService {
public List<ChartStatisticalRes> chartReport(ChartResultReq req) {
List<ChartStatisticalRes> data = new ArrayList<>();
AssessListReq query = new AssessListReq();
ChartStatisticalRes res = null;
ChartStatisticalRes res;
BeanUtils.copyProperties(req,query);
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(query);
res = new ChartStatisticalRes();
res.setType(0);
res.setData(process);
data.add(res);
List<ChartStatistical> scoreLevel = resultRecordService.countNumByScoreLevel(query);
res = new ChartStatisticalRes();
res.setType(1);
res.setData(scoreLevel);
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(1L);
data.add(res);
List<String> strings = evaluationGroupService.selectAllStaffIdsByGroupId(3L);
List<ChartStatistical> depstaff = this.countDepartmentAndStaffNum(strings);
res = new ChartStatisticalRes();
res.setType(2);
res.setData(depstaff);
data.add(res);
return data;
}

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

@ -339,10 +339,11 @@
</select>
<select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatistical">
SELECT count(flow_process) num,flow_process type from lz_result_record where is_delete=0 GROUP BY flow_process
SELECT count(flow_process) num,flow_process as 'desc' from lz_result_record where is_delete=0 GROUP BY flow_process
</select>
<select id="countNumByScoreLevel" resultType="com.lz.modules.performance.res.ChartStatistical">
SELECT count(score_level) num,score_level as 'desc' from lz_result_record where is_delete=0 GROUP BY score_level
</select>
<select id="selectResultRankList" resultType="com.lz.modules.performance.res.ResultRankListRes">