未符合项--导出(字段类型调整)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.modules.project.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -193,18 +194,22 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         }
 
         List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
-        List<NcrTrackVO> ncrTrackVOList = ncrTrackVO.getNcrTrackVOList();
+        String idJson = ncrTrackVO.getNcrTrackVOList();
-        //导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
+        if(StringUtils.isNotBlank(idJson)){
-        if(ObjectUtils.allNotNull(ncrTrackVOList)){
+            List<NcrTrackVO> ncrTrackVOList = JSONObject.parseArray(idJson, NcrTrackVO.class);
-            for (NcrTrackVO trackVO : ncrTrackVOList) {
+            //导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
-                List<NcrTrackVO> collect = trackVOList.stream()
+            if(ObjectUtils.allNotNull(ncrTrackVOList)){
-                        .filter(e -> trackVO.getId().equals(e.getId()) && trackVO.getFlowType().equals(e.getFlowType()))
+                for (NcrTrackVO trackVO : ncrTrackVOList) {
-                        .collect(Collectors.toList());
+                    List<NcrTrackVO> collect = trackVOList.stream()
-                if(collect.size() != 0){
+                            .filter(e -> trackVO.getId().equals(e.getId()) && trackVO.getFlowType().equals(e.getFlowType()))
-                    trackVOListTemp.addAll(collect);
+                            .collect(Collectors.toList());
+                    if(collect.size() != 0){
+                        trackVOListTemp.addAll(collect);
+                    }
                 }
             }
         }
+
         if(trackVOListTemp.size() != 0){
             return trackVOListTemp;
         }else{

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackInfoVO.java

@@ -45,15 +45,15 @@ public class NcrTrackInfoVO implements Serializable {
     @Excel(name = "标题", width = 20)
     private String title;
 
+    //流程类型
+    @Excel(name = "流程类型", width = 20)
+    private String flowType;
+
     //责任领域  duty_territory
     @Dict(dicCode ="duty_territory")
     @Excel(name = "责任领域", width = 20,dicCode ="duty_territory")
     private String dutyTerritory;
 
-    //流程类型
-    @Excel(name = "流程类型", width = 20)
-    private String flowType;
-
     //目标市场
     private String targetMarket;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java

@@ -47,14 +47,17 @@ public class NcrTrackVO implements Serializable {
     @Excel(name = "标题", width = 20)
     private String title;
 
+    //流程类型
+    @Excel(name = "流程类型", width = 20)
+    private String flowType;
+
     //责任领域  duty_territory
     @Dict(dicCode ="duty_territory")
     @Excel(name = "责任领域", width = 20,dicCode ="duty_territory")
     private String dutyTerritory;
 
-    //流程类型
+    //流程类型标识(枚举)
-    @Excel(name = "流程类型", width = 20)
+    private String flowTypeNumber;
-    private String flowType;
 
     //相关项目
     @Excel(name = "相关项目", width = 20)
@@ -114,7 +117,7 @@ public class NcrTrackVO implements Serializable {
     //验证问题类型  verify_flow_task_status
     private String verifyFlowTaskStatus;
 
-    private List<NcrTrackVO> ncrTrackVOList;
+    private String ncrTrackVOList;
 
 
     //以下字段跳转适用(还有项目库id)