生成卷内目录物理文档

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

@@ -42,6 +42,13 @@ public class ExtFilesController<V extends ExtFilesVO, S extends ExtFilesService<
         return ApiResult.ok("生成成功");
     }
 
+    @ApiOperation(value = "生成卷内目录", notes = "生成卷内目录")
+    @PostMapping(value = "/generateJNDirectory")
+    public ApiResult generateJNDirectory(@RequestParam("id") Long id) {
+        extFilesService.generateJNDirectory(id);
+        return ApiResult.ok("生成成功");
+    }
+
 }
 
 

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

@@ -31,7 +31,9 @@ import com.yonde.dex.dfs.vo.RepoFileVO;
 import com.yonde.dex.dict.feign.DictDataFeignService;
 import com.yonde.dex.dict.service.vo.DictDataVO;
 import com.yonde.dex.feign.applink.DxAppModelDefLinkFeignService;
+import com.yonde.dex.user.common.vo.DxOrganizationVO;
 import com.yonde.dex.user.common.vo.DxUserInfoVO;
+import com.yonde.dex.user.feign.DxOrganizationFeign;
 import com.yonde.dex.user.feign.DxUserInfoFeign;
 import com.yonde.dex.vo.info.DxApplicationVO;
 import lombok.extern.slf4j.Slf4j;
@@ -88,6 +90,9 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
     @Autowired
     private DxUserInfoFeign userService;
 
+    @Autowired
+    private DxOrganizationFeign organizationService;
+
     @Override
     public void beforeSave(Collection<V> target) {
         // 全宗号+项目号+项目代号+类别代号+盒号(三位流水号)+后缀“-（两位数字流水号）例如：2-20114272031-QH03-JS01-001-(01)
@@ -361,7 +366,7 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
             //将生成的文件挂载到案卷上
             DxObjFileUtils.replaceFile(extFilesVO, fileVo, FileTypeEnum.MASTER_FILE);
             extFilesVO.setOperator(OperatorType.MODIFY);
-            extDxContextProjectServiceFeign.saveRecursion(extFilesVO);
+            this.saveRecursion((V) extFilesVO);
         }
 
     }
@@ -382,7 +387,9 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
             datas.put("serialNumber",serialNumber);
             //责任责 ---文件创建部门
             DxUserInfoVO userVO = (DxUserInfoVO) userService.get(source.getCreatorId());
-            datas.put("author",userVO.getDxOrganization().getName());
+            //通过orgId获取组织名称
+            DxOrganizationVO organizationVO = (DxOrganizationVO) organizationService.get(userVO.getDxOrganizationId());
+            datas.put("author",organizationVO.getName());
             //文件题目 -- 文件名称
             datas.put("fileName",source.getName());
             //日期 -- 文件发布日期，有流程的文件取流程结束时间，无流程的文件取文件创建时间
@@ -393,9 +400,9 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
             datas.put("secret",searchDictDataValueByDictCode(Constants.SECRET_CODE,extFilesDocLinkVO.getSource().getSecretCode()));
             //备注 -- 文件本身的备注
             datas.put("note",source.getNote());
-            //档号 -- 文件档号
+            //档号 -- 文件档号 --在移交单文档关联中
             datas.put("fileDH","");
-
+            extFilesMap.add(datas);
             serialNumber++;
         }
         resultDatas.put("data", extFilesMap);