From 99bace6039bd0df7193566f4a8383d3cdafe11b0 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 4 Nov 2020 16:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8E=A8=E9=80=81=E6=97=B6?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?id=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowStartServiceImpl.java    | 29 +++++++++++++++++++
 .../job/business/DingtalkBusiness.java        | 18 ++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index ee5c37a2..f7b5cb26 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -186,6 +186,34 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		if(flowStart1 == null){
 			insertFlowStart(flowStart);
 		}else{
+			List<String> ids1= Arrays.stream(flowStart1.getGroupIds().split(",")).map(new Function<String, String>() {
+				@Override
+				public String apply(String s) {
+					return s;
+				}
+			}).collect(Collectors.toList());
+			Map<String, String> maps = ids1.stream().collect(Collectors.toMap(e->e, e->e));
+
+
+			List<String> ids= Arrays.stream(flowStart.getGroupIds().split(",")).map(new Function<String, String>() {
+				@Override
+				public String apply(String s) {
+					return s;
+				}
+			}).collect(Collectors.toList());
+			for (String str:ids
+				 ) {//过滤掉已经发起的
+				if(maps.containsKey(str)){
+					ids.remove(str);
+				}
+			}
+			if(ids.size() == 0){
+				return R.ok("发起成功，该任务已经发起过")
+						.put("data", flowStart1);
+			}
+			ids1.addAll(ids);
+			flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
+			updateById(flowStart1);//更新组信息到记录里面
 
 			flowStart.setId(flowStart1.getId());
 			flowStart.setIsDelete(flowStart1.getIsDelete());
@@ -299,6 +327,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			evaluationGroup.setId(null);
 			evaluationGroup.setGmtCreate(null);
 			evaluationGroup.setGmtModified(null);
+			evaluationGroup.setStartId(flowStart.getId());
 			evaluationGroupService.insertEvaluationGroup(evaluationGroup);
 
 			//拷贝考评组的指标信息
diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
index 719fd758..430ce54a 100644
--- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
+++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
@@ -28,6 +28,8 @@ import javax.annotation.Resource;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author fumeiai
@@ -199,6 +201,22 @@ public class DingtalkBusiness {
 
     public String sendWorkMSGWithThread(List<StaffSimpleInfo> toStaffids, int type) {
 
+        if(toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0){
+            //查询第三方id
+            List<Long> ids = toStaffids.stream().map(new Function<StaffSimpleInfo, Long>() {
+                @Override
+                public Long apply(StaffSimpleInfo staffSimpleInfo) {
+                    return staffSimpleInfo.getId();
+                }
+            }).collect(Collectors.toList());
+            List<StaffSimpleInfo> staffSimpleInfos = staffService.selectStaffSimpleInfos(ids);
+            Map<Long, StaffSimpleInfo> map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e->e));
+            for (StaffSimpleInfo staff:staffSimpleInfos
+                 ) {
+                StaffSimpleInfo staff1 = map.get(staff.getId());
+                staff1.setEmployeeId(staff1.getEmployeeId());
+            }
+        }
         WorkMsgTypeEnum workMsgTypeEnum = WorkMsgTypeEnum.findRoleTypeByCode(type);
 
         ThreadSendMessage threadSendMessage = new ThreadSendMessage(toStaffids, workMsgTypeEnum, appid);