From 513ede5708239f290791a9427487b92c670c7519 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 12 Nov 2020 12:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD=E9=80=94=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E7=BB=A9=E6=95=88=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/dao/ResultTagetLibMapper.java        |  2 +-
 .../service/impl/FlowStartServiceImpl.java    | 19 ++++++++++++++++---
 .../service/ResultTagetLibService.java        |  2 +-
 .../impl/ResultTagetLibServiceImpl.java       |  4 ++--
 .../mapper/flow/ResultTagetLibMapper.xml      |  2 +-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java
index 3c7cae1c..5c3d8f1d 100644
--- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java
@@ -37,7 +37,7 @@ public interface ResultTagetLibMapper extends BaseMapper<ResultTagetLib> {
 	int deleteResultTagetLibById(@Param("id")Long id);
 
 
-    List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
+    List<ResultTagetLib> selectResultTagetLibByModelId(Long id);
 
     List<ResultTagetLibDto> selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req);
 
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 54756f5f..230044e9 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
@@ -383,9 +383,21 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			evaluationGroup =
 					evaluationGroupService.selectEvaluationGroupByCopyId(evaluationGroup.getId(),flowStart.getId());
 			if(evaluationGroup == null){
-				log.info("无法assess/manager/detail找到拷贝组信息");
+				log.info("无法找到拷贝组信息");
 				return 5;
 			}
+			resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId());
+			if(resultModelDtos.size() == 0){
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
+				log.info("拷贝组的维度信息错误");
+				return 1;
+			}
+			for (ResultModelDto modelDto:resultModelDtos
+			) {
+				List<ResultTagetLibDto> resultTagetLibDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(modelDto.getId());
+				modelDto.setTagetLibs(resultTagetLibDtos);
+			}
+
 			//以下代码没必要更新，因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff
 			//evaluationGroup.setStaffIds(evaluationGroup.getStaffIds() + ",");
 
@@ -424,6 +436,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				resultRecord.setCurrentApprovalStaffName(staffInfo.getName());
 
 				resultRecordService.insertResultRecord(resultRecord);
+				//下面生成实际的考核流程
+				resultRecordService.initFlowRecord(resultRecord.getId());
 				staffInfo.setRecordId(resultRecord.getId());
 
 				for (ResultModelDto modelDto:resultModelDtos
@@ -454,8 +468,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 
 				}
 
-				//下面生成实际的考核流程
-				resultRecordService.initFlowRecord(resultRecord.getId());
+
 			}
 			evaluationStartStaffService.insertEvaluationStartStaffs(evaluationStartStaffs);
 			return 0;
diff --git a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java
index a0158ed0..b530a852 100644
--- a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java
+++ b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java
@@ -37,7 +37,7 @@ public interface ResultTagetLibService extends IService<ResultTagetLib> {
 	int deleteResultTagetLibById(Long id);
 
 
-    List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
+    List<ResultTagetLib> selectResultTagetLibByModelId(Long id);
 
     PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req);
 
diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java
index 341f6aa2..50370d6b 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java
@@ -55,7 +55,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
 			if(resultModel == null){
 				return R.error("找不到相关考核模板");
 			}
-			List<ResultTagetLibDto> resultTagetLibDtos = selectResultTagetLibByModelId(resultModel.getId());
+			List<ResultTagetLibDto> resultTagetLibDtos = selectResultTagetLibDtoByModelId(resultModel.getId());
 			BigDecimal weight = BigDecimal.ZERO;
 			for(int i = 0; i < resultTagetLibDtos.size(); i++){
 				ResultTagetLibDto dto = resultTagetLibDtos.get(i);
@@ -92,7 +92,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
 	}
 
 	@Override
-	public List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id){
+	public List<ResultTagetLib> selectResultTagetLibByModelId(Long id){
 		return resultTagetLibMapper.selectResultTagetLibByModelId(id);
 	}
 
diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml
index f4a1edd6..bf1fd63e 100644
--- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml
+++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml
@@ -89,7 +89,7 @@
         update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1  
     </update>
 
-    <select id="selectResultTagetLibByModelId" resultType="com.lz.modules.flow.model.ResultTagetLibDto" >
+    <select id="selectResultTagetLibByModelId" resultType="com.lz.modules.flow.entity.ResultTagetLib" >
         select * from lz_result_taget_lib  where model_id=#{id} and is_delete = 0 order by order_by desc
     </select>