获取项目裙下所有案卷并展开dxContext

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/impl/ExtFilesServiceImpl.java

@@ -112,27 +112,25 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
      */
     @Override
     public List<ExtFilesVO> findRecursionByVolumeNumber(String volumeNumber) {
+        // 案卷没有版本概念
         SearchQueryCondition queryDoc = SearchQueryCondition.builder()
                 .searchItems(SearchItems.builder()
                         .item(new SearchItem("volumeNumber", SearchItem.Operator.EQ, volumeNumber, null))
-                        .item(new SearchItem("latest", SearchItem.Operator.EQ, true, null))
-                        .item(new SearchItem("checkOuted", SearchItem.Operator.EQ, true, null))
+                        /*.item(new SearchItem("latest", SearchItem.Operator.EQ, true, null))
+                        .item(new SearchItem("checkOuted", SearchItem.Operator.EQ, true, null))*/
                         .operator(SearchItems.BooleanOperator.AND).build()).build();
         return (List<ExtFilesVO>) this.findRecursion(queryDoc).getContent();
     }
 
     @Override
     public List<ExtFilesVO> getExtFilesByProjectCode(String projectCode) {
-        SearchQueryCondition searchProgram = SearchUtil.buildQuery("number", SearchItem.Operator.EQ, projectCode);
-        DxPageImpl programDxPage = extDxContextProjectServiceFeign.findRecursion(searchProgram);
-        DxContextProjectVO dxContextProjectVO = (DxContextProjectVO) programDxPage.getContent().get(0);
-        String volumeNumber = "-" + dxContextProjectVO.getNumber() + "-";
-
+        String volumeNumber = "-" + projectCode + "-";
         SearchQueryCondition queryDoc = SearchQueryCondition.builder()
+                .openProp(SearchQueryCondition.builder().name("dxContext").build())
                 .searchItems(SearchItems.builder()
                         .item(new SearchItem("volumeNumber", SearchItem.Operator.LIKE, volumeNumber, null))
-                        .item(new SearchItem("latest", SearchItem.Operator.EQ, true, null))
-                        .item(new SearchItem("checkOuted", SearchItem.Operator.EQ, true, null))
+                        /*.item(new SearchItem("latest", SearchItem.Operator.EQ, true, null))
+                        .item(new SearchItem("checkOuted", SearchItem.Operator.EQ, true, null))*/
                         .operator(SearchItems.BooleanOperator.AND).build()).build();
 
         List<ExtFilesVO> extFilesVOList = (List<ExtFilesVO>) this.findRecursion(queryDoc).getContent();