案卷下不计算归档已作废、档案未接收的文档

inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/archivesOtherVO/ExtFilesUpdateVO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * @author weihongda
  * @Date 2024/11/1 16:39
- * @Description: TODO
+ * @Description: 公用接收前端参数类
  */
 @Data
 public class ExtFilesUpdateVO implements Serializable {

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

@@ -32,7 +32,7 @@ public class ExtFilesController<V extends ExtFilesVO, S extends ExtFilesService<
 
     @ApiOperation(value = "获取项目群", notes = "移交单下文件清单退档")
     @GetMapping(value = "/getExtFilesByProjectCode")
-    public ApiResult getExtFilesByProjectCode(@RequestParam("projectCode") Long projectCode) {
+    public ApiResult getExtFilesByProjectCode(@RequestParam("projectCode") String projectCode) {
         List<ExtFilesVO> extFilesVOList = extFilesService.getExtFilesByProjectCode(projectCode);
         return ApiResult.ok(extFilesVOList);
     }

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

@@ -36,6 +36,6 @@ public interface ExtFilesService<V extends ExtFilesVO> extends ExtFilesServiceSh
      * @param projectCode
      * @return
      */
-    List<ExtFilesVO> getExtFilesByProjectCode(Long projectCode);
+    List<ExtFilesVO> getExtFilesByProjectCode(String projectCode);
 
 }

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

@@ -122,7 +122,7 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
     }
 
     @Override
-    public List<ExtFilesVO> getExtFilesByProjectCode(Long projectCode) {
+    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);

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

@@ -286,6 +286,10 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
                             .item(new SearchItem("belongingCaseFile", SearchItem.Operator.EQ, volumeNumber, null))
                             .operator(SearchItems.BooleanOperator.AND).build()).build();
             List<ExtTransferDocLinkVO> extTransferDocLinkVOList = extTransferDocLinkService.findRecursion(queryDoc).getContent();
+            extTransferDocLinkVOList = extTransferDocLinkVOList.stream().filter(obj ->
+                    !obj.getSource().getArchivingStatus().equals(ExtDxDocumentServiceImpl.ARCHIVE_INVALIDATED)
+                            && !obj.getSource().getArchivingStatus().equals(ExtDxDocumentServiceImpl.ARCHIVE_NOT_RECEIVED))
+                    .collect(Collectors.toList());
 
             for (ExtTransferDocLinkVO extTransferDocLinkVO : extTransferDocLinkVOList) {
                 // 最大密级