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-11-06 16:42:30 +08:00
commit 9c211ed74e
6 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/app/resp/FlowDetailResp.java
View File

@ -9,5 +9,6 @@ public class FlowDetailResp {
private Long flowRecordId;
private String departName;
private String avatar;
private int status ;
}

7
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.lz.common.emun.WorkMsgTypeEnum;
import com.lz.common.exception.RRException;
@ -96,7 +97,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
@Override
public PageUtils assessList(AssessListReq req) {
List<AssessManagerListRes> data = new ArrayList<>();
List<AssessManagerListRes> data = Lists.newArrayList();
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> flowStartMapper.selectListByTime(page,req.getCycleType(),req.getName())
);
@ -183,7 +184,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
if(req.getChangeType() == 0){
//获取所有考核人员
List<String> all = new ArrayList<>();
List<String> all = Lists.newArrayList();
//根据组id成员分组
Map<Long,List<String>> map = Maps.newHashMap();
@ -209,7 +210,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
}
//初始化添加用户的数据
List<GroupStaffs> groupS = new ArrayList<>();
List<GroupStaffs> groupS = Lists.newArrayList();
//排除已发起过的
List<Long> longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId());

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

@ -1,6 +1,7 @@
package com.lz.modules.performance.service.impl;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.lz.common.utils.DateUtils;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.StringUtil;
@ -55,7 +56,7 @@ public class AssessServiceImpl implements AssessService {
@Override
public PageUtils userTaskList(AssessTaskReq req,Long userId) {
PageUtils data = new PageUtils();
List<TaskListRes> list = new ArrayList<>();
List<TaskListRes> list = Lists.newArrayList();
PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId);
if(CollectionUtils.isEmpty(pageUtils.getList())){
return data;

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

@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R;
@ -89,7 +90,7 @@ public class ChartResultServiceImpl implements ChartResultService {
}
//自己管理的部门
List<String> mandepartmentIds = assessService.roleDepartments(staffId);
List<ChartStatisticalRes> data = new ArrayList<>();
List<ChartStatisticalRes> data = Lists.newArrayList();
ChartStatisticalRes res;
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId,null,mandepartmentIds);
@ -153,7 +154,7 @@ public class ChartResultServiceImpl implements ChartResultService {
return Collections.EMPTY_LIST;
}
List<ChartStatistical> data = new ArrayList<>();
List<ChartStatistical> data = Lists.newArrayList();
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.list(new QueryWrapper<DepartmentsStaffRelateEntity>()
.eq("is_delete", 0)
.in("staff_id", staffIds));
@ -195,7 +196,7 @@ public class ChartResultServiceImpl implements ChartResultService {
@Override
public PageUtils chartStarts(ChartStartsReq req) {
List<ChartStartsRes> data = new ArrayList<>();
List<ChartStartsRes> data = Lists.newArrayList();
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
page -> flowStartMapper.selectListByPage(page,req.getCycleType())
);
@ -230,7 +231,7 @@ public class ChartResultServiceImpl implements ChartResultService {
//构建流程默认人数
private List<ChartStatistical> buildProcess(List<ChartStatistical> process,Long startId,List<String> mandepartmentIds){
List<ChartStatistical> data = new ArrayList<>();
List<ChartStatistical> data = Lists.newArrayList();
Map map = Maps.newHashMap();
int count = resultRecordService.count(new QueryWrapper<ResultRecord>()
.eq("is_delete", 0)

8
src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java
View File

@ -67,7 +67,7 @@ public class ChartServiceImpl implements ChartService {
//如果多次提交会统计有问题
@Override
public List<GraphicsStatisticalDto> resultProgressDistribution(int type, String monthTime,String departmentId) {
List<GraphicsStatisticalDto> dtos = new ArrayList<>();
List<GraphicsStatisticalDto> dtos = Lists.newArrayList();
//获取所有人员总数
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId);
@ -129,8 +129,8 @@ public class ChartServiceImpl implements ChartService {
List<String> staffIds = staffService.staffsByAllDeparmentIds(allDeparmentIds);
int total = staffIds.size();
List<GraphicsStatisticalDto> staffLevels = resultRecordService.staffDistribution(selectMonthTime,staffIds);
List<String> names = new ArrayList<>();
List<Double> datas = new ArrayList<>();
List<String> names = Lists.newArrayList();
List<Double> datas = Lists.newArrayList();
int konwn = 0;
for (GraphicsStatisticalDto staffLevel : staffLevels) {
names.add(staffLevel.getCategory());
@ -398,7 +398,7 @@ public class ChartServiceImpl implements ChartService {
private PageUtils buildPages( List<String> departments,ResultDistributionReq req, int totalSize){
List<ReportDistributionDto> data = new ArrayList<>();
List<ReportDistributionDto> data = Lists.newArrayList();
if(CollectionUtils.isEmpty(departments)){
return new PageUtils();
}

20
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -1131,11 +1131,21 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
Map<String,Integer> auth = new HashMap<>();
auth.put("showScore",1);
auth.put("showResult",1);
auth.put("showScore",1);
List<FlowRecord> currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2);
log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId());
if(currentResultRecords !=null && currentResultRecords.size() > 0 ){
FlowRecord currentFlowRecord = currentResultRecords.get(0);
int flowProcess = currentFlowRecord.getFlowProcess();
if(flowProcess < 3 ){
auth.put("showResult",0);
}
if( flowProcess < 4 ){
auth.put("showScore",0);
}
FlowRecord currentResultRecord = null;
for(FlowRecord flowRecord:currentResultRecords){
if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){
@ -1172,6 +1182,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowDetailResp.setCurrentStaffId(flowRecord.getApprovalStaffId());
flowDetailResp.setStaffName(flowRecord.getApprovalStaffName());
flowDetailResp.setFlowRecordId(flowRecord.getId());
int status = flowRecord.getStatus();
if (flowRecord.getStatus() == 3) {
status = 0;
}
if (flowRecord.getStatus() == 2) {
status = 1;
}
flowDetailResp.setStatus(status);
StaffEntity staffEntity = staffService.selectStaffById(flowRecord.getApprovalStaffId());
DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(flowRecord.getApprovalStaffId());
flowDetailResp.setAvatar(staffEntity.getAvatar());