archive file

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/EvalProjectArchiveFileController.java

@@ -31,10 +31,10 @@ public class EvalProjectArchiveFileController implements Serializable {
 
     private final EvalProjectArchiveFileServiceI evalProjectArchiveFileServiceI;
 
-    @GetMapping
+    @GetMapping("/org/page")
-    @ApiOperation("查询安全评价项目档案文件列表-分页")
+    @ApiOperation("查询安全评价项目档案文件列表-机构端分页")
     public PageResponse<EvalProjectArchiveFileCo> list(@Validated EvalProjectArchiveFilePageQry qry) {
-        return evalProjectArchiveFileServiceI.listEvalProjectArchiveFilePage(qry);
+        return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileOrgPage(qry);
     }
 
     @GetMapping("/{id}")

safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/executor/query/EvalProjectArchiveFilePageQueryExe.java

@@ -26,7 +26,7 @@ public class EvalProjectArchiveFilePageQueryExe {
      * @return
      */
     public PageResponse<EvalProjectArchiveFileCo> execute(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
-        return evalProjectArchiveFileQueryService.listEvalProjectArchiveFilePage(evalProjectArchiveFilePageQry);
+        return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry);
     }
 
 }

safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/EvalProjectArchiveFileServiceI.java

@@ -19,7 +19,7 @@ public interface EvalProjectArchiveFileServiceI {
      * @param evalProjectArchiveFilePageQry 查找条件对象
      * @return 结果集
      */
-    PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
+    PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
 
     /**
      * 根据ID获取安全评价项目档案文件详情

safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/impl/EvalProjectArchiveFileServiceImpl.java

@@ -31,7 +31,7 @@ public class EvalProjectArchiveFileServiceImpl implements EvalProjectArchiveFile
     private final EvalProjectArchiveFilePageQueryExe evalProjectArchiveFilePageQueryExe;
 
     @Override
-    public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
+    public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
         return evalProjectArchiveFilePageQueryExe.execute(evalProjectArchiveFilePageQry);
     }
 

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java

@@ -42,4 +42,10 @@ public class EvalProjectArchiveFilePageQry extends PageQuery {
     @ApiModelProperty(value = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传")
     private String recordSource;
 
+    /**
+    * 组织ID
+    */
+    @ApiModelProperty(value = "机构ID")
+    private Long orgId;
+
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java

@@ -47,11 +47,11 @@ public class EvalProjectArchiveFileCo extends ClientObject {
      */
     @ApiModelProperty(value = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传")
     private String recordSource;
-    /**
+
-     * 环境
+    @ApiModelProperty(value = "创建时间")
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "环境")
+    private String createTime;
-    private String env;
+
-    @ApiModelProperty(value = "version")
+    @ApiModelProperty(value = "创建人")
-    private Integer version;
+    protected String createName;
 }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/EvalProjectArchiveFileGatewayImpl.java

@@ -23,6 +23,7 @@ public class EvalProjectArchiveFileGatewayImpl implements EvalProjectArchiveFile
     @Override
     public Boolean add(EvalProjectArchiveFileE evalProjectArchiveFileE) {
         EvalProjectArchiveFileDO evalProjectArchiveFileDO = evalProjectArchiveFileDoConvertor.convertEeToDo(evalProjectArchiveFileE);
+        evalProjectArchiveFileDO.setDeleteEnum("false");
         boolean res = evalProjectArchiveFileRepository.addEvalProjectArchiveFile(evalProjectArchiveFileDO);
         if (res) {
             evalProjectArchiveFileE.setId(evalProjectArchiveFileDO.getId());

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalProjectArchiveFileQueryService.java

@@ -27,5 +27,5 @@ public interface EvalProjectArchiveFileQueryService {
      * @param evalProjectArchiveFilePageQry 分页Qry
      * @return
      */
-    PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
+    PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
 }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProjectArchiveFileQueryServiceImpl.java

@@ -33,8 +33,8 @@ public class EvalProjectArchiveFileQueryServiceImpl implements EvalProjectArchiv
     }
 
     @Override
-    public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
+    public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
-        IPage<EvalProjectArchiveFileDO> evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFilePage(PageHelper.queryToPage(evalProjectArchiveFilePageQry), evalProjectArchiveFilePageQry);
+        IPage<EvalProjectArchiveFileDO> evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFileOrgPage(PageHelper.queryToPage(evalProjectArchiveFilePageQry), evalProjectArchiveFilePageQry);
         List<EvalProjectArchiveFileCo> evalProjectArchiveFileCoS = evalProjectArchiveFileDoConvertor.converDosToCos(evalProjectArchiveFileDoPage.getRecords());
         return PageHelper.pageToResponse(evalProjectArchiveFileDoPage, evalProjectArchiveFileCoS);
     }

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalProjectArchiveFileRepository.java

@@ -27,7 +27,7 @@ public interface EvalProjectArchiveFileRepository extends BaseRepository<EvalPro
      * @param evalProjectArchiveFilePageQry 条件对象
      * @return ipage
      */
-    IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFilePage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
+    IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
 
     /**
      * 新增安全评价项目档案文件

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java

@@ -33,7 +33,7 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl<Eva
     }
 
     @Override
-    public IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFilePage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
+    public IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) {
         QueryWrapper<EvalProjectArchiveFileDO> evalProjectArchiveFileDoQueryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotEmpty(evalProjectArchiveFilePageQry.getProjectId())) {
             evalProjectArchiveFileDoQueryWrapper.eq("project_id", evalProjectArchiveFilePageQry.getProjectId());