From f667a8584207408379920216bc310caee26d48bf Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 17 Nov 2020 14:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowStartServiceImpl.java    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 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 27ed584f..97010a8e 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
@@ -414,7 +414,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 
 			List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
 			List<ResultDetail> resultDetails = new ArrayList();
-			List<ResultRecord> resultRecords = new ArrayList<>();
+
 			//下面初始化参与人员
 			for (StaffSimpleInfo staffInfo:staffIds
 			) {
@@ -446,16 +446,14 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				resultRecord.setCurrentApprovalStaffId(staffInfo.getId());
 				//设置当前审批员工姓名 current_approval_staff_name
 				resultRecord.setCurrentApprovalStaffName(staffInfo.getName());
-				resultRecords.add(resultRecord);
-			}
-			resultRecordService.saveBatch(resultRecords);
-			for (ResultRecord resultRecord:
-			resultRecords) {
-
 
 				resultRecordService.insertResultRecord(resultRecord);
+
+
+				resultRecordService.initFlowRecord(resultRecord.getId());
+
 				//下面生成实际的考核流程
-				//staffInfo.setRecordId(resultRecord.getId());
+				staffInfo.setRecordId(resultRecord.getId());
 
 				for (ResultModelDto modelDto:resultModelDtos
 				) {
@@ -601,7 +599,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			List<ResultDetail> resultDetails = new ArrayList<>();
 
 			List<EvaluationStartStaff> evaluationStartStaffs = new ArrayList<>();
-
+			List<ResultRecord> resultRecords = new ArrayList<>();
 			//下面初始化参与人员
 			for (StaffSimpleInfo staffInfo:staffIds
 			) {
@@ -628,6 +626,9 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				resultRecord.setEvaluationId(evaluationGroup.getId());
 				resultRecord.setFlowProcess(0);//设置为目标制定
 
+
+
+
 				//下面初始化flow_staff_id_role字段，步骤为0的
 				String roleJSON = "[";
 				for (int i = 0; i < flowApprovalRoles.size() ;i++){
@@ -707,8 +708,13 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				roleJSON += "]";
 				roleJSON = roleJSON.replace(",]", "]");
 				resultRecord.setFlowStaffIdRole(roleJSON);
-				resultRecordService.insertResultRecord(resultRecord);
-				staffInfo.setRecordId(resultRecord.getId());
+				resultRecords.add(resultRecord);
+			}
+			resultRecordService.saveBatch(resultRecords);
+			for (ResultRecord resultRecord:
+					resultRecords) {
+				//resultRecordService.insertResultRecord(resultRecord);
+				//staffInfo.setRecordId(resultRecord.getId());
 				//下面生成实际的考核流程
 				resultRecordService.initFlowRecord(resultRecord.getId());
 				//下面生成ResultDetail对象
@@ -723,7 +729,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 							resultDetail.setType(modelDto.getType());
 							resultDetail.setKeyResult(libDto.getKeyResult());
 							resultDetail.setCheckWeight(libDto.getWeight());
-							resultDetail.setStaffId(staffInfo.getId());
+							resultDetail.setStaffId(resultRecord.getStaffId());
 							resultDetail.setPriority(libDto.getOrderBy());
 							resultDetail.setModelId(modelDto.getId());
 							resultDetails.add(resultDetail);