7/5 xiexiang

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java

@@ -258,6 +258,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
 
     /**
      * 查找无效理由和证据列表
+     * 分页查询
      * @param
      * @return
      */
@@ -273,69 +274,71 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
             BeanUtils.copyProperties(invalidReason,queryInvalidReasonVO);
             queryInvalidReasonVOS.add(queryInvalidReasonVO);
         }
-        this.loadInvalidReason(queryInvalidReasonVOS);
-
-
-
-        return queryInvalidReasonVOS;
+        List<QueryInvalidReasonVO> queryInvalidReasonVOs = this.loadInvalidReason(queryInvalidReasonVOS);
+        return queryInvalidReasonVOs;
     }
 
-    /**
-     * 把无效理由集合装载到要返回的列表集合中
-     * @param queryInvalidReasonVOS
-     */
-    public List<QueryInvalidReasonVO> loadInvalidReason(List<QueryInvalidReasonVO> queryInvalidReasonVOS){
-        //若类型为2,3,则查询证据组合
-        //查询出类型为2,3时的无效理由ids
-        List<Integer> invalidReasonsIds = queryInvalidReasonVOS.stream()
-                .filter(item -> item.getInvalidName() == 2 || item.getInvalidName() == 3)
-                .map(QueryInvalidReasonVO::getId)
-                .collect(Collectors.toList());
-        //根据无效理由ids查询出所有的证据组合
-        LambdaQueryWrapper<ProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.in(ProofGroup::getInvalidReasonId, invalidReasonsIds);
-        List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper1);
-        //由于查出来的proofGroups中没有proofIds这个字段，于是采用下面的方法装载成proofGroupVOS
-        List<QueryInvalidReasonVO.proofGroupIn> proofGroupIns = this.loadProofGroupVO(proofGroups);
-        for(QueryInvalidReasonVO queryInvalidReasonVO:queryInvalidReasonVOS){
-            List<QueryInvalidReasonVO.proofGroupIn> proofGroupIn= proofGroupIns.stream().filter(item -> item.getInvalidReasonId().equals(queryInvalidReasonVO.getId())).collect(Collectors.toList());
-            queryInvalidReasonVO.setProofGroups(proofGroupIn);
-            queryInvalidReasonVOS.add(queryInvalidReasonVO);
-        }
-        return queryInvalidReasonVOS;
-    }
+                    /**查找无效理由和证据列表
+                     *
+                     * 把无效理由集合装载到要返回的列表集合中
+                     * @param queryInvalidReasonVOS
+                     */
+                    public List<QueryInvalidReasonVO> loadInvalidReason(List<QueryInvalidReasonVO> queryInvalidReasonVOS){
+                        //若类型为2,3,则查询证据组合
+                        //查询出类型为2,3时的无效理由ids
+                        List<Integer> invalidReasonsIds = queryInvalidReasonVOS.stream()
+                                .filter(item -> item.getInvalidName() == 2 || item.getInvalidName() == 3)
+                                .map(QueryInvalidReasonVO::getId)
+                                .collect(Collectors.toList());
+                        //根据无效理由ids查询出所有的证据组合
+                        LambdaQueryWrapper<ProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
+                        queryWrapper1.in(ProofGroup::getInvalidReasonId, invalidReasonsIds);
+                        List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper1);
+                        //由于查出来的proofGroups中没有proofIds这个字段，于是采用下面的方法装载成proofGroupVOS
+                        List<QueryInvalidReasonVO.proofGroupIn> proofGroupIns = this.loadProofGroupVO(proofGroups);
+                        for(QueryInvalidReasonVO queryInvalidReasonVO:queryInvalidReasonVOS){
+                            //比对无效理由id，把能匹配上的进行装载
+                            List<QueryInvalidReasonVO.proofGroupIn> proofGroupIn= proofGroupIns.stream()
+                                    .filter(item -> item.getInvalidReasonId().equals(queryInvalidReasonVO.getId()))
+                                    .collect(Collectors.toList());
+                            queryInvalidReasonVO.setProofGroups(proofGroupIn);
+                            queryInvalidReasonVOS.add(queryInvalidReasonVO);
+                        }
+                        return queryInvalidReasonVOS;
+                    }
 
-    /**
-     * 把查出来的所有证据组合实体类集合转成VO类集合
-     * @param proofGroups
-     */
-    public List<QueryInvalidReasonVO.proofGroupIn> loadProofGroupVO(List<ProofGroup> proofGroups){
-        List<QueryInvalidReasonVO.proofGroupIn> proofGroupIns = new ArrayList<>();
-        //根据传入的proofGroups对象集合，过滤出所有的ids
-        List<Integer> proofGroupIds = proofGroups.stream()
-                .map(ProofGroup::getId)
-                .collect(Collectors.toList());
-        //根据组合ids查询出每一个groupId对应的proofIds
-        //首先批量查出来所有的证据和证据组合关联对象
-        LambdaQueryWrapper<AssoProofGroup> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoProofGroup::getGroupId, proofGroupIds);
-        List<AssoProofGroup> assoProofGroups = assoProofGroupService.list(queryWrapper);
-        //证据组合的装载
-        for (ProofGroup proofGroup : proofGroups) {
-            QueryInvalidReasonVO.proofGroupIn proofGroupIn = new QueryInvalidReasonVO.proofGroupIn();
-            //基本信息装载
-            proofGroupIn.setInvalidReasonId(proofGroup.getInvalidReasonId());
-            proofGroupIn.setDescription(proofGroup.getDescription());
-            proofGroupIn.setArgument_str(proofGroup.getArgument_str());
-            List<Integer> proofIds = assoProofGroups.stream().filter(item->item.getGroupId().equals(proofGroup.getId())).map(AssoProofGroup::getProofId).collect(Collectors.toList());
-            proofGroupIn.setProofIds(proofIds);
-            proofGroupIns.add(proofGroupIn);
-        }
-        return proofGroupIns;
-    }
+                    /**查找无效理由和证据列表
+                     *
+                     * 把查出来的所有证据组合实体类集合转成VO类集合
+                     * @param proofGroups
+                     */
+                    public List<QueryInvalidReasonVO.proofGroupIn> loadProofGroupVO(List<ProofGroup> proofGroups){
+                        List<QueryInvalidReasonVO.proofGroupIn> proofGroupIns = new ArrayList<>();
+                        //根据传入的proofGroups对象集合，过滤出所有的ids
+                        List<Integer> proofGroupIds = proofGroups.stream()
+                                .map(ProofGroup::getId)
+                                .collect(Collectors.toList());
+                        //根据组合ids查询出每一个groupId对应的proofIds
+                        //首先批量查出来所有的证据和证据组合关联对象
+                        LambdaQueryWrapper<AssoProofGroup> queryWrapper = new LambdaQueryWrapper<>();
+                        queryWrapper.in(AssoProofGroup::getGroupId, proofGroupIds);
+                        List<AssoProofGroup> assoProofGroups = assoProofGroupService.list(queryWrapper);
+                        //证据组合的装载
+                        for (ProofGroup proofGroup : proofGroups) {
+                            QueryInvalidReasonVO.proofGroupIn proofGroupIn = new QueryInvalidReasonVO.proofGroupIn();
+                            //基本信息装载
+                            proofGroupIn.setInvalidReasonId(proofGroup.getInvalidReasonId());
+                            proofGroupIn.setDescription(proofGroup.getDescription());
+                            proofGroupIn.setArgument_str(proofGroup.getArgument_str());
+                            List<Integer> proofIds = assoProofGroups.stream().filter(item->item.getGroupId().equals(proofGroup.getId())).map(AssoProofGroup::getProofId).collect(Collectors.toList());
+                            proofGroupIn.setProofIds(proofIds);
+                            proofGroupIns.add(proofGroupIn);
+                        }
+                        return proofGroupIns;
+                    }
 
 
-    public String queryInvalidReasonDetail(@RequestBody ShareReportDTO shareReportDTO) throws IOException {
+    public String queryInvalidReasonDetail(Integer id) throws IOException {
         //根据报告id查询无效理由
         ///若类型为2,3则查询证据组合和特征并装载
         return Response.success();