根据项目群代码，查询所有案卷

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/controller/ExtFilesController.java

@@ -27,6 +27,15 @@ import org.springframework.stereotype.Controller;
 @Controller(ExtFilesController.BEAN_NAME)
 public class ExtFilesController<V extends ExtFilesVO, S extends ExtFilesService<V>> extends ExtFilesControllerShadow<V, S> {
 
+    @Autowired
+    private ExtFilesService extFilesService;
+
+    @ApiOperation(value = "获取项目群", notes = "移交单下文件清单退档")
+    @GetMapping(value = "/getExtFilesByProjectCode")
+    public ApiResult getExtFilesByProjectCode(@RequestParam("projectCode") Long projectCode) {
+        List<ExtFilesVO> extFilesVOList = extFilesService.getExtFilesByProjectCode(projectCode);
+        return ApiResult.ok(extFilesVOList);
+    }
 
 }
 

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/controller/ExtTransferDocumentController.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
 @Controller(ExtTransferDocumentController.BEAN_NAME)
 public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S extends ExtTransferDocumentService<V>> extends ExtTransferDocumentControllerShadow<V, S> {
 
-
     @Autowired
     private ExtTransferDocumentService extTransferDocumentService;
 
@@ -33,24 +32,32 @@ public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S ex
         return ApiResult.ok(extTransferDocumentService.startWorkflow(id), "流程启动成功");
     }
 
-    @ApiOperation(value = "更新案卷部分字段信息", notes = "更新案卷部分字段信息", httpMethod = "POST")
+    @ApiOperation(value = "更新案卷部分字段信息", notes = "更新案卷部分字段信息")
     @PostMapping(value = "/updateExtFiles")
     public ApiResult updateExtFiles(@RequestBody ExtTransferDocumentVO extTransferDocumentVO) {
         extTransferDocumentService.updateExtFiles(extTransferDocumentVO);
         return ApiResult.ok(ApiResult.SUCCESS, "更新案卷部分信息成功");
     }
 
-    @ApiOperation(value = "获取项目信息", notes = "获取项目信息", httpMethod = "POST")
+    @ApiOperation(value = "获取项目信息", notes = "获取项目信息")
     @GetMapping(value = "/getTransferDocProject")
     public ApiResult getTransferDocProjectById(@RequestParam("id") Long id) {
         return ApiResult.ok(extTransferDocumentService.getTransferDocProjectById(id));
     }
 
-    @ApiOperation(value = "获取文档列表", notes = "获取文档列表", httpMethod = "POST")
-    @GetMapping(value = "/getDxDocumentList")
+    @ApiOperation(value = "获取文档列表", notes = "获取文档列表")
+    @PostMapping(value = "/getDxDocumentList")
     public ApiResult getDxDocumentList(@RequestBody SearchQueryCondition searchQueryCondition) {
         return ApiResult.ok(extTransferDocumentService.getDxDocumentList(searchQueryCondition));
     }
+
+    @ApiOperation(value = "移交单下文件清单退档", notes = "移交单下文件清单退档")
+    @GetMapping(value = "/returnDocument")
+    public ApiResult returnDocument(@RequestParam("id") Long id,
+                                    @RequestParam("docId") Long docId) {
+        extTransferDocumentService.returnDocument(id, docId);
+        return ApiResult.ok(ApiResult.SUCCESS, "退档成功");
+    }
 }
 
 

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

@@ -28,4 +28,12 @@ public interface ExtFilesService<V extends ExtFilesVO> extends ExtFilesServiceSh
      * @return
      */
     List<ExtFilesVO> findRecursionByVolumeNumber(String volumeNumber);
+
+    /**
+     * 根据项目代号查询所有案卷
+     *
+     * @param projectCode
+     * @return
+     */
+    List<ExtFilesVO> getExtFilesByProjectCode(Long projectCode);
 }

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

@@ -32,4 +32,6 @@ public interface ExtTransferDocumentService<V extends ExtTransferDocumentVO> ext
     LocalDateTime getEndDate(List<DxWfProcessTaskVO> activities, String activityName);
 
     void updateArchivingStatus(Long id);
+
+    void returnDocument(Long id, Long docId);
 }

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

@@ -112,6 +112,24 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
         return (List<ExtFilesVO>) this.findRecursion(queryDoc).getContent();
     }
 
+    @Override
+    public List<ExtFilesVO> getExtFilesByProjectCode(Long 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() + "-";
+
+        SearchQueryCondition queryDoc = SearchQueryCondition.builder()
+                .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))
+                        .operator(SearchItems.BooleanOperator.AND).build()).build();
+
+        List<ExtFilesVO> content = (List<ExtFilesVO>) this.findRecursion(queryDoc).getContent();
+        return content;
+    }
+
     private String getProjectCodeAndNumber(DxContextProjectVO dxContextProjectVO) {
         boolean projectClass = false;
         // 项目群上的合同编号

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

@@ -210,6 +210,11 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
         }
     }
 
+    @Override
+    public void returnDocument(Long id, Long docId) {
+
+    }
+
     @Override
     public DxUserInfoVO getSignInfo(List<DxWfProcessTaskVO> activities, String activityName) {
         for (DxWfProcessTaskVO wf : activities) {