From 70b21c9c84855105fcf1dcc066e05ddc0c48346a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 May 2022 14:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9--=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NcrTrackServiceImpl.java     | 20 +++++++++++--------
 .../jero/modules/project/vo/NcrTrackVO.java   |  6 ++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index eda632bb0..b31df7887 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -24,7 +24,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -175,24 +174,29 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         }
         //待办任务id
         if(trackVOList.size() != 0){
-            List<String> projectTaskInventoryIdList = trackVOList.stream().map(NcrTrackVO::getId).distinct().collect(Collectors.toList());
+            List<String> projectLawsInventoryIdList = trackVOList.stream().map(NcrTrackVO::getProjectLawsInventoryId).distinct().collect(Collectors.toList());
             QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>();
-            taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectTaskInventoryIdList);
+            taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList);
+            //任务清单数据
             List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = projectTaskInventoryDetailEOService.list(taskDetailQueryWrapper);
             for (NcrTrackVO trackVO : trackVOList) {
-                String projectTaskInventoryId = trackVO.getId();
-                String prcType = trackVO.getPrcType();
-                if(StringUtils.isNotBlank(projectTaskInventoryId) && StringUtils.isNotBlank(prcType)){
+                String projectLawsInventoryId = trackVO.getProjectLawsInventoryId();//任务清单id
+                String prcType = trackVO.getPrcType();//流程类型
+                if(StringUtils.isNotBlank(projectLawsInventoryId) && StringUtils.isNotBlank(prcType)){
                     List<ProjectTaskInventoryDetailEO> collect = projectTaskInventoryDetailEOList.stream()
-                            .filter(e -> projectTaskInventoryId.equals(e.getProjectTaskInventoryId()) && prcType.equals(e.getFlowType()))
+                            .filter(e -> projectLawsInventoryId.equals(e.getProjectTaskInventoryId()) && prcType.equals(e.getFlowType()))
                             .collect(Collectors.toList());
                     if(collect.size() != 0){
-                        trackVO.setTaskId(collect.get(0).getTaskId());
+                        trackVO.setTaskId(collect.get(0).getTaskId());//待办任务id
+                        trackVO.setStatus(collect.get(0).getStatus());
+                        trackVO.setProjectTaskInventoryDetailId(collect.get(0).getId());
+                        trackVO.setTaskDefinitionKey(collect.get(0).getTaskDefinitionKey());
                     }
                 }
             }
         }
 
+
         List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
         String idJson = ncrTrackVO.getNcrTrackVOList();
         if(StringUtils.isNotBlank(idJson)){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index 16338d3a5..6b463b8f0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -129,6 +129,12 @@ public class NcrTrackVO implements Serializable {
     private String prcId;
     //流程类型
     private String prcType;
+    //状态：待办 、已办
+    private String status;
+    //任务清单详情id
+    private String projectTaskInventoryDetailId;
+    //任务节点定义key
+    private String taskDefinitionKey;