From 7df5d3a3589bd4e378263bf7bf4a4b7da27f94b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Thu, 10 Dec 2020 10:23:58 +0800
Subject: [PATCH] fix

---
 .../dao/TaskProcessRecordMapper.java          |  3 +++
 .../performance/req/ChangeTaskListReq.java    |  5 +++-
 .../impl/TaskProcessRecordServiceImpl.java    | 23 ++++++++++++++++---
 .../performance/TaskProcessRecordMapper.xml   | 10 ++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
index e955747f..5b9cad8d 100644
--- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
+++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java
@@ -40,4 +40,7 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
     int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);
 
 	TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId);
+
+	List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskIds(@Param("page") IPage page, @Param("taskIds") List<Long> taskIds);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java
index 278f1a1a..8a50ea22 100644
--- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java
+++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java
@@ -15,6 +15,9 @@ import lombok.Data;
 @ApiModel("任务变更记录")
 public class ChangeTaskListReq extends BasePage {
 
-    @ApiModelProperty(value="任务id",name = "taskId")
+    @ApiModelProperty(value="任务id（二选一）",name = "taskId")
     private Long taskId;
+
+    @ApiModelProperty(value="详情id（二选一）",name = "detailId")
+    private Long detailId;
 }
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 640d9faa..2a2ce79e 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
@@ -5,6 +5,7 @@ import com.lz.common.utils.PageUtils;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.performance.dao.TaskProcessRecordMapper;
+import com.lz.modules.performance.dto.ResultTaskDto;
 import com.lz.modules.performance.dto.TaskProcessRecordDto;
 import com.lz.modules.performance.entity.ResultTask;
 import com.lz.modules.performance.entity.TaskProcessRecord;
@@ -18,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
 * <p>
@@ -81,9 +84,23 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 
 	@Override
 	public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) {
-		PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
-				page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
-		);
+		PageUtils pageUtils = new PageUtils();
+		if(req.getDetailId()!=null){
+			List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId());
+			if(CollectionUtils.isNotEmpty(resultTaskDtos)){
+				List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
+				pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
+						page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskIds(page, collect)
+				);
+			}
+
+		}
+		else {
+			pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
+					page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
+			);
+		}
+
 		List list = pageUtils.getList();
 		if(CollectionUtils.isNotEmpty(list)){
 			Long taskId = req.getTaskId();
diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
index c9cc4bf0..462f41f5 100644
--- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
+++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
@@ -107,5 +107,15 @@
     </select>
 
 
+    <select id="selectTaskProcessRecordsByTaskIds" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
+        select gmt_create,remark,label,type from lz_task_process_record  where is_delete = 0
+        and
+        task_id in
+        <foreach collection="taskIds" item="taskId"separator="," open="(" close=")">
+            #{taskId}
+        </foreach>
+        order by gmt_create desc
+    </select>
+
 </mapper>