From 5dc2b4e24fabbc3729c6b16ff05f6882e0998fa6 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 11 Nov 2020 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AD=E9=80=94=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=82=E4=B8=8E=E7=BB=A9=E6=95=88=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowStartServiceImpl.java    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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 fee3f5bf..8789120e 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
@@ -149,8 +149,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				log.info("无有效考核人员");
 				R.error(groupStaffs.getEvaluationGroup().getName() + "——无有效考核人员");
 			}
-			EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupByCopyId(groupStaffs.getEvaluationGroup().getId(),flowStart.getId());
-			switch (start(evaluationGroup, flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole)){
+
+			switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole, true)){
 
 				case 1:
 					return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置考核模板");
@@ -279,7 +279,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 
 
 
-			switch (start(evaluationGroup, flowStart, staffManages, staffIds, mustRole, selfMustRole)){
+			switch (start(evaluationGroup, flowStart, staffManages, staffIds, mustRole, selfMustRole, false)){
 
 				case 1:
 					return R.error(evaluationGroup.getName() + "——没有设置考核模板");
@@ -296,10 +296,10 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		}
 		return R.ok("发起成功").put("data", flowStart);
 	}
-
+	//isInsert表示是否中途加人
 	private int start(EvaluationGroup evaluationGroup, FlowStart flowStart,
 					  Map<String, List<StaffEntity>> staffManages, List<StaffSimpleInfo> staffIds,
-					  Map<Long, List<FlowChartRole>> mustRole, Map<Long, List<FlowChartRole>> selfMustRole){
+					  Map<Long, List<FlowChartRole>> mustRole, Map<Long, List<FlowChartRole>> selfMustRole, boolean isInsert){
 
 
 		List<ResultModelDto> resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId());
@@ -341,7 +341,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 		}
 
 		//下面拷贝一份考评组信息发起后所使用的考评组id为复制后的id
-		if(evaluationGroup.getCopyId() == null || evaluationGroup.getCopyId().longValue() == 0L){
+		if(isInsert){
 			evaluationGroup.setCopyId(evaluationGroup.getId());
 			evaluationGroup.setId(null);
 			evaluationGroup.setGmtCreate(null);
@@ -379,6 +379,15 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				//插入备份的考评组指标信息
 				resultTagetLibService.insertResultTagetLibs(resultTagetLibs);
 			}
+		}else{
+			evaluationGroup =
+					evaluationGroupService.selectEvaluationGroupByCopyId(evaluationGroup.getId(),flowStart.getId());
+			if(evaluationGroup == null){
+				log.info("无法找到拷贝组信息");
+				return 5;
+			}
+			//以下代码没必要更新，因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff
+			//evaluationGroup.setStaffIds(evaluationGroup.getStaffIds() + ",");
 		}