From 9d185d4398d61e7a841e24fe1838c9834048347d 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, 6 Nov 2020 15:41:47 +0800 Subject: [PATCH] fix --- .../service/impl/AssessManagerServiceImpl.java | 7 ++++--- .../performance/service/impl/AssessServiceImpl.java | 3 ++- .../performance/service/impl/ChartResultServiceImpl.java | 9 +++++---- .../modules/sys/service/app/impl/ChartServiceImpl.java | 8 ++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 05d80216..8f4638d2 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -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 data = new ArrayList<>(); + List 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 all = new ArrayList<>(); + List all = Lists.newArrayList(); //根据组id成员分组 Map> map = Maps.newHashMap(); @@ -209,7 +210,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { } //初始化添加用户的数据 - List groupS = new ArrayList<>(); + List groupS = Lists.newArrayList(); //排除已发起过的 List longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId()); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index 140486a6..7ee3b094 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -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 list = new ArrayList<>(); + List list = Lists.newArrayList(); PageUtils pageUtils = flowRecordService.selectTaskListByApprovalStaffId(req,userId); if(CollectionUtils.isEmpty(pageUtils.getList())){ return data; 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 131fe4f2..f1ddd27e 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 @@ -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 mandepartmentIds = assessService.roleDepartments(staffId); - List data = new ArrayList<>(); + List data = Lists.newArrayList(); ChartStatisticalRes res; List process = resultRecordService.countNumByFlowProcess(startId,null,mandepartmentIds); @@ -153,7 +154,7 @@ public class ChartResultServiceImpl implements ChartResultService { return Collections.EMPTY_LIST; } - List data = new ArrayList<>(); + List data = Lists.newArrayList(); List list = departmentsStaffRelateService.list(new QueryWrapper() .eq("is_delete", 0) .in("staff_id", staffIds)); @@ -195,7 +196,7 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public PageUtils chartStarts(ChartStartsReq req) { - List data = new ArrayList<>(); + List 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 buildProcess(List process,Long startId,List mandepartmentIds){ - List data = new ArrayList<>(); + List data = Lists.newArrayList(); Map map = Maps.newHashMap(); int count = resultRecordService.count(new QueryWrapper() .eq("is_delete", 0) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java index 243895d6..5bfea31f 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ChartServiceImpl.java @@ -67,7 +67,7 @@ public class ChartServiceImpl implements ChartService { //如果多次提交会统计有问题 @Override public List resultProgressDistribution(int type, String monthTime,String departmentId) { - List dtos = new ArrayList<>(); + List dtos = Lists.newArrayList(); //获取所有人员总数 List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(departmentId); @@ -129,8 +129,8 @@ public class ChartServiceImpl implements ChartService { List staffIds = staffService.staffsByAllDeparmentIds(allDeparmentIds); int total = staffIds.size(); List staffLevels = resultRecordService.staffDistribution(selectMonthTime,staffIds); - List names = new ArrayList<>(); - List datas = new ArrayList<>(); + List names = Lists.newArrayList(); + List 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 departments,ResultDistributionReq req, int totalSize){ - List data = new ArrayList<>(); + List data = Lists.newArrayList(); if(CollectionUtils.isEmpty(departments)){ return new PageUtils(); }