From cc8269b31f867e1c3c0ae4d25eb18f2601ba4cd7 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, 16 Oct 2020 14:59:51 +0800
Subject: [PATCH] fix

---
 .../flow/service/EvaluationGroupService.java  |  3 ++
 .../impl/EvaluationGroupServiceImpl.java      | 33 +++++++++++++++++--
 .../controller/ChartController.java           |  6 ++--
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
index 003b8f8b..3a8a7278 100644
--- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
+++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
@@ -31,5 +31,8 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
 
 	int deleteEvaluationGroupById(Long id);
 
+	//获取参与考核的所有人员
+	List<String> selectAllStaffIdsById(Long id);
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 7205839a..1ade5a03 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -1,13 +1,15 @@
 package com.lz.modules.flow.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.modules.app.service.StaffService;
 import com.lz.modules.flow.dao.EvaluationGroupMapper;
 import com.lz.modules.flow.entity.EvaluationGroup;
 import com.lz.modules.flow.service.EvaluationGroupService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 /**
 * <p>
@@ -24,6 +26,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
     @Autowired
 	private EvaluationGroupMapper evaluationGroupMapper;
+    @Autowired
+	private StaffService staffService;
 
 
 
@@ -61,6 +65,31 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 	}
 
 
+	@Override
+	public List<String> selectAllStaffIdsById(Long id) {
+		EvaluationGroup evaluationGroup = this.selectEvaluationGroupById(id);
+		String depIds = evaluationGroup.getDepIds();
+		Set<String> allDeparmentIds = new HashSet<>();
+		if(StringUtils.isNotBlank(depIds)){
+			String[] split = depIds.split(",");
+			for(String s:split){
+				List<String> strings = staffService.selectAllDeparmentIdsByDepartmentParentId(s);
+				allDeparmentIds.addAll(strings);
+			}
+		}
+		List<String> depStaffIds = staffService.staffsByAllDeparmentIds(new ArrayList<>(allDeparmentIds));
 
-
+		String staffIds = evaluationGroup.getStaffIds();
+		if(StringUtils.isNotBlank(staffIds)){
+			String[] split = staffIds.split(",");
+			depStaffIds.addAll(Arrays.asList(split));
+		}
+		String outIds = evaluationGroup.getOutIds();
+		if(StringUtils.isNotBlank(outIds)){
+			String[] split = outIds.split(",");
+			depStaffIds.removeAll(Arrays.asList(split));
+		}
+		//去重
+		return new ArrayList<>(new HashSet(depStaffIds));
+	}
 }
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 6a5e3f2b..ffe0e52e 100644
--- a/src/main/java/com/lz/modules/performance/controller/ChartController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java
@@ -9,6 +9,7 @@ import com.lz.modules.performance.res.TaskListRes;
 import com.lz.modules.performance.service.ChartResultService;
 import com.lz.modules.sys.controller.AbstractController;
 import io.swagger.annotations.*;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @Author: djc
@@ -39,9 +41,7 @@ public class ChartController extends AbstractController{
         List<ChartStatisticalRes> data = new ArrayList<>();
         chartResultService.chartReport(req);
         EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(1L);
-        String depIds = evaluationGroup.getDepIds();
-        String staffIds = evaluationGroup.getStaffIds();
-        String outIds = evaluationGroup.getOutIds();
+
         return R.ok();
     }