fix
This commit is contained in:
parent
ec47988039
commit
9d185d4398
@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.lz.common.emun.WorkMsgTypeEnum;
|
import com.lz.common.emun.WorkMsgTypeEnum;
|
||||||
import com.lz.common.exception.RRException;
|
import com.lz.common.exception.RRException;
|
||||||
@ -96,7 +97,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageUtils assessList(AssessListReq req) {
|
public PageUtils assessList(AssessListReq req) {
|
||||||
List<AssessManagerListRes> data = new ArrayList<>();
|
List<AssessManagerListRes> data = Lists.newArrayList();
|
||||||
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
|
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
|
||||||
page -> flowStartMapper.selectListByTime(page,req.getCycleType(),req.getName())
|
page -> flowStartMapper.selectListByTime(page,req.getCycleType(),req.getName())
|
||||||
);
|
);
|
||||||
@ -183,7 +184,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
|||||||
|
|
||||||
if(req.getChangeType() == 0){
|
if(req.getChangeType() == 0){
|
||||||
//获取所有考核人员
|
//获取所有考核人员
|
||||||
List<String> all = new ArrayList<>();
|
List<String> all = Lists.newArrayList();
|
||||||
|
|
||||||
//根据组id成员分组
|
//根据组id成员分组
|
||||||
Map<Long,List<String>> map = Maps.newHashMap();
|
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());
|
List<Long> longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId());
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package com.lz.modules.performance.service.impl;
|
package com.lz.modules.performance.service.impl;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.lz.common.utils.DateUtils;
|
import com.lz.common.utils.DateUtils;
|
||||||
import com.lz.common.utils.PageUtils;
|
import com.lz.common.utils.PageUtils;
|
||||||
import com.lz.common.utils.StringUtil;
|
import com.lz.common.utils.StringUtil;
|
||||||
@ -55,7 +56,7 @@ public class AssessServiceImpl implements AssessService {
|
|||||||
@Override
|
@Override
|
||||||
public PageUtils userTaskList(AssessTaskReq req,Long userId) {
|
public PageUtils userTaskList(AssessTaskReq req,Long userId) {
|
||||||
PageUtils data = new PageUtils();
|
PageUtils data = new PageUtils();
|
||||||
List<TaskListRes> list = new ArrayList<>();
|
List<TaskListRes> list = Lists.newArrayList();
|
||||||
PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId);
|
PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId);
|
||||||
if(CollectionUtils.isEmpty(pageUtils.getList())){
|
if(CollectionUtils.isEmpty(pageUtils.getList())){
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.lz.common.utils.PageUtils;
|
import com.lz.common.utils.PageUtils;
|
||||||
import com.lz.common.utils.R;
|
import com.lz.common.utils.R;
|
||||||
@ -89,7 +90,7 @@ public class ChartResultServiceImpl implements ChartResultService {
|
|||||||
}
|
}
|
||||||
//自己管理的部门
|
//自己管理的部门
|
||||||
List<String> mandepartmentIds = assessService.roleDepartments(staffId);
|
List<String> mandepartmentIds = assessService.roleDepartments(staffId);
|
||||||
List<ChartStatisticalRes> data = new ArrayList<>();
|
List<ChartStatisticalRes> data = Lists.newArrayList();
|
||||||
ChartStatisticalRes res;
|
ChartStatisticalRes res;
|
||||||
|
|
||||||
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId,null,mandepartmentIds);
|
List<ChartStatistical> process = resultRecordService.countNumByFlowProcess(startId,null,mandepartmentIds);
|
||||||
@ -153,7 +154,7 @@ public class ChartResultServiceImpl implements ChartResultService {
|
|||||||
return Collections.EMPTY_LIST;
|
return Collections.EMPTY_LIST;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ChartStatistical> data = new ArrayList<>();
|
List<ChartStatistical> data = Lists.newArrayList();
|
||||||
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.list(new QueryWrapper<DepartmentsStaffRelateEntity>()
|
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.list(new QueryWrapper<DepartmentsStaffRelateEntity>()
|
||||||
.eq("is_delete", 0)
|
.eq("is_delete", 0)
|
||||||
.in("staff_id", staffIds));
|
.in("staff_id", staffIds));
|
||||||
@ -195,7 +196,7 @@ public class ChartResultServiceImpl implements ChartResultService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageUtils chartStarts(ChartStartsReq req) {
|
public PageUtils chartStarts(ChartStartsReq req) {
|
||||||
List<ChartStartsRes> data = new ArrayList<>();
|
List<ChartStartsRes> data = Lists.newArrayList();
|
||||||
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
|
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
|
||||||
page -> flowStartMapper.selectListByPage(page,req.getCycleType())
|
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){
|
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();
|
Map map = Maps.newHashMap();
|
||||||
int count = resultRecordService.count(new QueryWrapper<ResultRecord>()
|
int count = resultRecordService.count(new QueryWrapper<ResultRecord>()
|
||||||
.eq("is_delete", 0)
|
.eq("is_delete", 0)
|
||||||
|
|||||||
@ -67,7 +67,7 @@ public class ChartServiceImpl implements ChartService {
|
|||||||
//如果多次提交会统计有问题
|
//如果多次提交会统计有问题
|
||||||
@Override
|
@Override
|
||||||
public List<GraphicsStatisticalDto> resultProgressDistribution(int type, String monthTime,String departmentId) {
|
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);
|
List<String> allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId);
|
||||||
|
|
||||||
@ -129,8 +129,8 @@ public class ChartServiceImpl implements ChartService {
|
|||||||
List<String> staffIds = staffService.staffsByAllDeparmentIds(allDeparmentIds);
|
List<String> staffIds = staffService.staffsByAllDeparmentIds(allDeparmentIds);
|
||||||
int total = staffIds.size();
|
int total = staffIds.size();
|
||||||
List<GraphicsStatisticalDto> staffLevels = resultRecordService.staffDistribution(selectMonthTime,staffIds);
|
List<GraphicsStatisticalDto> staffLevels = resultRecordService.staffDistribution(selectMonthTime,staffIds);
|
||||||
List<String> names = new ArrayList<>();
|
List<String> names = Lists.newArrayList();
|
||||||
List<Double> datas = new ArrayList<>();
|
List<Double> datas = Lists.newArrayList();
|
||||||
int konwn = 0;
|
int konwn = 0;
|
||||||
for (GraphicsStatisticalDto staffLevel : staffLevels) {
|
for (GraphicsStatisticalDto staffLevel : staffLevels) {
|
||||||
names.add(staffLevel.getCategory());
|
names.add(staffLevel.getCategory());
|
||||||
@ -398,7 +398,7 @@ public class ChartServiceImpl implements ChartService {
|
|||||||
|
|
||||||
|
|
||||||
private PageUtils buildPages( List<String> departments,ResultDistributionReq req, int totalSize){
|
private PageUtils buildPages( List<String> departments,ResultDistributionReq req, int totalSize){
|
||||||
List<ReportDistributionDto> data = new ArrayList<>();
|
List<ReportDistributionDto> data = Lists.newArrayList();
|
||||||
if(CollectionUtils.isEmpty(departments)){
|
if(CollectionUtils.isEmpty(departments)){
|
||||||
return new PageUtils();
|
return new PageUtils();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user