项目为符合项导出

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java

@@ -11,7 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -80,11 +82,11 @@ public class NcrTrackController {
      *  @param request
      * @param ncrTrackVO
      */
-    @RequestMapping(value = "/exportData")
+    @RequestMapping(value = "/exportData",method = RequestMethod.POST)
     @RequiresPermissions("ncrTrack:exportData")
     public void exportData(HttpServletResponse response,
                            HttpServletRequest request,
-                           NcrTrackVO ncrTrackVO) {
+                           @RequestBody NcrTrackVO ncrTrackVO) {
         iNcrTrackService.exportData(response,request, ncrTrackVO);
     }
 
@@ -93,11 +95,11 @@ public class NcrTrackController {
      *  @param request
      * @param ncrTrackVO
      */
-    @RequestMapping(value = "/exportDataInfo")
+    @RequestMapping(value = "/exportDataInfo",method = RequestMethod.POST)
     @RequiresPermissions("ncrTrack:exportDataInfo")
     public void exportDataInfo(HttpServletResponse response,
-                           HttpServletRequest request,
-                           NcrTrackVO ncrTrackVO) {
+                               HttpServletRequest request,
+                               @RequestBody NcrTrackVO ncrTrackVO) {
         iNcrTrackService.exportData(response,request, ncrTrackVO);
     }
 

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

@@ -241,12 +241,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
 
 
         List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
-        String idJson = ncrTrackVO.getNcrTrackVOList();
-        if(StringUtils.isNotBlank(idJson)){
-            List<NcrTrackVO> ncrTrackVOList = JSONObject.parseArray(idJson, NcrTrackVO.class);
+        List<NcrTrackVO> ncrTrackVOListTemp = ncrTrackVO.getNcrTrackVOList();
             //导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
-            if(ObjectUtils.allNotNull(ncrTrackVOList)){
-                for (NcrTrackVO trackVO : ncrTrackVOList) {
+            if(ObjectUtils.allNotNull(ncrTrackVOListTemp)){
+                for (NcrTrackVO trackVO : ncrTrackVOListTemp) {
                     List<NcrTrackVO> collect = trackVOList.stream()
                             .filter(e -> trackVO.getId().equals(e.getId()) && trackVO.getFlowType().equals(e.getFlowType()))
                             .collect(Collectors.toList());
@@ -255,7 +253,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                     }
                 }
             }
-        }
 
         if(trackVOListTemp.size() != 0){
             return trackVOListTemp;

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

@@ -1,7 +1,6 @@
 package com.jero.modules.project.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,6 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -119,7 +119,7 @@ public class NcrTrackVO implements Serializable {
     //验证问题类型  verify_flow_task_status
     private String verifyFlowTaskStatus;
 
-    private String ncrTrackVOList;
+    private List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
 
 
     //以下字段跳转适用(还有项目库id)