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 7f160b91..6c2c1c33 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -27,10 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.concurrent.*; +import java.util.function.Function; import java.util.function.Supplier; /** @@ -111,15 +109,7 @@ public class ChartController extends AbstractController{ return R.ok().put("data",ownResultResps); } - public void main(String[] args) { - ExecutorService executor = Executors.newFixedThreadPool(10); - List resultRecords = Lists.newArrayList(); - CompletableFuture> listCompletableFuture = CompletableFuture.supplyAsync(() -> resultRecordService.list(), executor); - try { - resultRecords = listCompletableFuture.get(); - } catch (Exception e) { - e.printStackTrace(); - } - } + + } diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index bec1ffa5..b4373e7d 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -14,8 +14,8 @@ import lombok.Data; @ApiModel("获取报表等级详情实体") public class ChartResultReq extends BasePage{ - @ApiModelProperty(value = "部门id",name = "departmentId") - private String departmentId; + @ApiModelProperty(value = "部门ids,逗号隔开",name = "departmentIds") + private String departmentIds; @ApiModelProperty(value = "考核id",name = "startId") private Long startId; 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 93302d3f..72282a64 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 @@ -122,7 +122,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { }else { ResultRecord resultRecord = resultRecordMapper.selectOneByStartId(flowStart.getId(),mandepartmentIds); int i = resultRecordMapper.countStartAndGroupNum(flowStart.getId(),mandepartmentIds); - res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + i + "等人"); + res.setJoinNum(resultRecord == null? StringUtil.EMPTY : resultRecord.getStaffName() + "等"+ i + "人"); } data.add(res); 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 e6e35b49..e3731c09 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 @@ -4,6 +4,7 @@ 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.google.common.collect.Sets; import com.lz.common.exception.RRException; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; @@ -182,7 +183,16 @@ public class ChartResultServiceImpl implements ChartResultService { @Override public PageUtils selectChartDetailList(ChartResultReq req) { - List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); + String departmentIds = req.getDepartmentIds(); + Set allDepart = Sets.newHashSet(); + if(StringUtil.isNotBlank(departmentIds)){ + String[] split = departmentIds.split(","); + for(String s:split){ + List deparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(s); + allDepart.addAll(deparmentIds); + } + } + List allDeparmentIds = new ArrayList<>(allDepart); //自己管理的和所有的部门交集 log.info("selectChartDetailList 查询部门:" + JSON.toJSONString(allDeparmentIds)); List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId());