From 1ff27fe0786e5b2f404adc7562e1de56697bcde2 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, 11 Dec 2020 15:38:43 +0800
Subject: [PATCH] fix

---
 .../com/lz/modules/performance/dao/ResultTaskMapper.java     | 2 ++
 .../performance/service/impl/ResultTaskServiceImpl.java      | 2 +-
 .../service/impl/TaskProcessRecordServiceImpl.java           | 5 ++++-
 src/main/resources/mapper/performance/ResultTaskMapper.xml   | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
index c8c5a454..b4164503 100644
--- a/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
+++ b/src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java
@@ -35,6 +35,8 @@ public interface ResultTaskMapper extends BaseMapper<ResultTask> {
 
 	List<ResultTaskDto> selectResultTaskDtosByDetailId(@Param("detailId") Long detailId);
 
+	List<ResultTaskDto> selectAllResultTaskDtosByDetailId(@Param("detailId") Long detailId);
+
 	List<ResultTask> selectResultTasksByDetailId(@Param("detailId") Long detailId);
 
     int deleteResultTasksByDetailId(Long detailId);
diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index 99043539..0cd8cafd 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -189,7 +189,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		if(before == null){
 			taskProcessRecord.setType(ProcessRecordEnum.ADD.getType());
 			taskProcessRecord.setDetailId(after.getDetailId());
-			taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100)).setScale(2) + "%");
+			taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + ";进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100)).setScale(2) + "%");
 			return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
 		}
 		taskProcessRecord.setTaskId(before.getId());
diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
index 555e561c..9c08c8e0 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
@@ -9,6 +9,7 @@ import com.lz.modules.app.entity.StaffOccupationEntity;
 import com.lz.modules.app.model.TaskModel;
 import com.lz.modules.app.service.StaffOccupationService;
 import com.lz.modules.app.service.StaffService;
+import com.lz.modules.performance.dao.ResultTaskMapper;
 import com.lz.modules.performance.dao.TaskProcessRecordMapper;
 import com.lz.modules.performance.dto.ResultTaskDto;
 import com.lz.modules.performance.dto.TaskProcessRecordDto;
@@ -57,6 +58,8 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 	private StaffService staffService;
     @Autowired
 	private StaffOccupationService staffOccupationService;
+    @Autowired
+	private ResultTaskMapper resultTaskMapper;
 
 
 
@@ -99,7 +102,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 		Long detailId = req.getDetailId();
 		PageUtils pageUtils = new PageUtils();
 		if(detailId!=null){
-			List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(detailId);
+			List<ResultTaskDto> resultTaskDtos = resultTaskMapper.selectAllResultTaskDtosByDetailId(detailId);
 			if(CollectionUtils.isNotEmpty(resultTaskDtos)){
 				List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
 				pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml
index 95ebb1e9..fcc82271 100644
--- a/src/main/resources/mapper/performance/ResultTaskMapper.xml
+++ b/src/main/resources/mapper/performance/ResultTaskMapper.xml
@@ -95,5 +95,9 @@
     <select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
         select id, is_delete, name,process_rate from lz_result_task  where detail_id=#{detailId} and is_delete = 0
     </select>
+
+    <select id="selectAllResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
+        select id, is_delete, name,process_rate from lz_result_task  where detail_id=#{detailId}
+    </select>
 </mapper>