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

---
 .../project/mapper/xml/NcrTrackMapper.xml     |  5 +-
 .../service/impl/NcrTrackServiceImpl.java     | 63 +++++++++++++++----
 .../jero/modules/project/vo/NcrTrackVO.java   | 12 ++++
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index f39b7ee9a..e193d375a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.jero.modules.project.mapper.NcrTrackMapper">
     <resultMap id="NcrTrackVOResultMap" type="com.jero.modules.project.vo.NcrTrackVO">
         <id column="id" property="id" />
+        <id column="project_library_id" property="projectLibraryId" />
         <id column="serial_number" property="serialNumber" />
         <result column="title" property="title" />
         <result column="duty_territory" property="dutyTerritory" />
@@ -27,8 +28,8 @@
     <select id="getInfoList" resultMap="NcrTrackVOResultMap">
         SELECT
         pni.project_name,plb.target_market,
-        pli.id,pli.serial_number,pli.title,pli.duty_territory,pli.create_time,
-        pti.design_flow_task_status,pti.prehomo_flow_task_status,pti.verify_flow_task_status,pti.design_p_id,pti.prehomo_p_id,pti.verify_p_id,
+        pli.serial_number,pli.title,pli.duty_territory,pli.create_time,pli.project_library_id,
+        pti.design_flow_task_status,pti.prehomo_flow_task_status,pti.verify_flow_task_status,pti.design_p_id,pti.prehomo_p_id,pti.verify_p_id,pti.id,pti.project_laws_inventory_id,
         pli.design_initiator_id,pli.design_duty_id,pli.prehomo_initiator_id,pli.prehomo_duty_id,pli.verify_initiator_id,pli.verify_duty_id
 
         FROM project_task_inventory pti
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 522e4a80b..69a61a64e 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
@@ -1,9 +1,11 @@
 package com.jero.modules.project.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
 import com.jero.modules.project.enums.ReviewResultEnum;
 import com.jero.modules.project.mapper.NcrTrackMapper;
 import com.jero.modules.project.service.INcrTrackService;
@@ -11,6 +13,7 @@ import com.jero.modules.project.vo.NcrTrackInfoVO;
 import com.jero.modules.project.vo.NcrTrackVO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -45,8 +48,8 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
     private NcrTrackMapper ncrTrackMapper;
     @Autowired
     private ISysUserService sysUserService;
-    @Value(value = "${jero.path.upload}")
-    private String uploadpath;
+    @Autowired
+    private ProjectTaskInventoryDetailEOServiceImpl projectTaskInventoryDetailEOService;
 
     @Override
     public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
@@ -76,11 +79,11 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
 
         for (NcrTrackVO trackVO : infoList) {
             //设计符合性确认
-            String designPId = trackVO.getDesignPId();
+            String designPId = trackVO.getDesignPId();//流程实例id
             //PreHomo确认
-            String prehomoPId = trackVO.getPrehomoPId();
+            String prehomoPId = trackVO.getPrehomoPId();//流程实例id
             //验证符合性确认
-            String verifyPId = trackVO.getVerifyPId();
+            String verifyPId = trackVO.getVerifyPId();//流程实例id
 
             //设计问题类型
             String designFlowTaskStatus = trackVO.getDesignFlowTaskStatus();
@@ -116,7 +119,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                         designName,
                         sysUserList,
                         trackVO.getId(),
-                        trackVO.getCreateTime());
+                        trackVO.getCreateTime(),
+                        trackVO.getProjectLibraryId(),
+                        trackVO.getProjectLawsInventoryId(),
+                        FlowTypeEnum.SJFHXSHLC.getValue());
                 trackVOList.add(ncrTrackVOTemp);
             }
             //PreHomo确认
@@ -132,7 +138,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                         prehomoName,
                         sysUserList,
                         trackVO.getId(),
-                        trackVO.getCreateTime());
+                        trackVO.getCreateTime(),
+                        trackVO.getProjectLibraryId(),
+                        trackVO.getProjectLawsInventoryId(),
+                        FlowTypeEnum.PREHOMOQRLC.getValue());
                 trackVOList.add(ncrTrackVOTemp);
             }
             //验证符合性确认
@@ -148,7 +157,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                         verifyName,
                         sysUserList,
                         trackVO.getId(),
-                        trackVO.getCreateTime());
+                        trackVO.getCreateTime(),
+                        trackVO.getProjectLibraryId(),
+                        trackVO.getProjectLawsInventoryId(),
+                        FlowTypeEnum.YZFHXSCLC.getValue());
                 trackVOList.add(ncrTrackVOTemp);
             }
         }
@@ -160,10 +172,29 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         if(StringUtils.isNotBlank(ncrTrackVO.getProblemType())){
             trackVOList = trackVOList.stream().filter(e->ncrTrackVO.getProblemType().equals(e.getProblemType())).collect(Collectors.toList());
         }
+        //待办任务id
+        if(trackVOList.size() != 0){
+            List<String> projectTaskInventoryIdList = trackVOList.stream().map(NcrTrackVO::getId).distinct().collect(Collectors.toList());
+            QueryWrapper<ProjectTaskInventoryDetailEO> taskDetailQueryWrapper = new QueryWrapper<>();
+            taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectTaskInventoryIdList);
+            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)){
+                    List<ProjectTaskInventoryDetailEO> collect = projectTaskInventoryDetailEOList.stream()
+                            .filter(e -> projectTaskInventoryId.equals(e.getProjectTaskInventoryId()) && prcType.equals(e.getFlowType()))
+                            .collect(Collectors.toList());
+                    if(collect.size() != 0){
+                        trackVO.setTaskId(collect.get(0).getTaskId());
+                    }
+                }
+            }
+        }
 
         List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
         List<NcrTrackVO> ncrTrackVOList = ncrTrackVO.getNcrTrackVOList();
-        //导出数据过滤(列表中选取多条进行导出的时候,用id和流程类型作为条件进行数据过滤)
+        //导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
         if(ObjectUtils.allNotNull(ncrTrackVOList)){
             for (NcrTrackVO trackVO : ncrTrackVOList) {
                 List<NcrTrackVO> collect = trackVOList.stream()
@@ -238,7 +269,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                                   String name,
                                   List<SysUser> sysUserList,
                                   String id,
-                                  Date createTime){
+                                  Date createTime,
+                                  String projectLibraryId,
+                                  String projectLawsInventoryId,
+                                  String flowTypeNumber){
         String uuid = UUID.randomUUID().toString().replace("-", "");
         String initiatorTemp ="";
         String dutyTemp ="";
@@ -255,7 +289,12 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             }
         }
         NcrTrackVO ncrTrackVO = new NcrTrackVO();
-        ncrTrackVO.setId(id);
+        //跳转字段赋值
+        ncrTrackVO.setPrcId(flowType);//流程实例
+        ncrTrackVO.setProjectLibraryId(projectLibraryId);//项目库id
+        ncrTrackVO.setProjectLawsInventoryId(projectLawsInventoryId);//法规清单id
+        ncrTrackVO.setPrcType(flowTypeNumber);//流程类型
+        ncrTrackVO.setTaskId(id);
         ncrTrackVO.setUuid(uuid);
         ncrTrackVO.setCreateTime(createTime);
         ncrTrackVO.setSerialNumber(serialNumber);//编号
@@ -289,10 +328,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             OutputStream excelOS = response.getOutputStream();;
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.XSSF);
-            //项目详情中的导出(没有相关项目字段)
             if(StringUtils.isBlank(ncrTrackVO.getProjectLibraryId())){
                 workbook = ExcelExportUtil.exportExcel(exportParams, NcrTrackVO.class, dataList);
             }else{
+                //项目详情中的导出(没有相关项目字段)
                 for (NcrTrackVO trackVO : dataList) {
                     NcrTrackInfoVO ncrTrackInfoVO = new NcrTrackInfoVO();
                     BeanUtils.copyProperties(trackVO,ncrTrackInfoVO);
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 0f8ca76b9..b33ba3f8b 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
@@ -25,6 +25,7 @@ import java.util.List;
 public class NcrTrackVO implements Serializable {
 
 
+    //任务清单id
     private String id;
 
     //用于导出时勾选数据
@@ -116,6 +117,17 @@ public class NcrTrackVO implements Serializable {
     private List<NcrTrackVO> ncrTrackVOList;
 
 
+    //以下字段跳转适用(还有项目库id)
+    //待办任务id
+    private String taskId;
+    //法规清单id
+    private String projectLawsInventoryId;
+    //流程实例id
+    private String prcId;
+    //流程类型
+    private String prcType;
+
+