From dca9570931acc39a74116c75e29539321fa03b94 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 25 Aug 2026 14:40:01 +0800 Subject: [PATCH] archive file --- .../web/EvalProjectArchiveFileController.java | 6 +++--- .../query/EvalProjectArchiveFilePageQueryExe.java | 2 +- .../service/EvalProjectArchiveFileServiceI.java | 2 +- .../impl/EvalProjectArchiveFileServiceImpl.java | 2 +- .../request/EvalProjectArchiveFilePageQry.java | 6 ++++++ .../file/response/EvalProjectArchiveFileCo.java | 14 +++++++------- .../gateway/EvalProjectArchiveFileGatewayImpl.java | 1 + .../EvalProjectArchiveFileQueryService.java | 2 +- .../EvalProjectArchiveFileQueryServiceImpl.java | 4 ++-- .../EvalProjectArchiveFileRepository.java | 2 +- .../impl/EvalProjectArchiveFileRepositoryImpl.java | 2 +- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/EvalProjectArchiveFileController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/EvalProjectArchiveFileController.java index e68dbaad..6d0adb9d 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/EvalProjectArchiveFileController.java +++ b/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 - @ApiOperation("查询安全评价项目档案文件列表-分页") + @GetMapping("/org/page") + @ApiOperation("查询安全评价项目档案文件列表-机构端分页") public PageResponse list(@Validated EvalProjectArchiveFilePageQry qry) { - return evalProjectArchiveFileServiceI.listEvalProjectArchiveFilePage(qry); + return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileOrgPage(qry); } @GetMapping("/{id}") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/executor/query/EvalProjectArchiveFilePageQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/executor/query/EvalProjectArchiveFilePageQueryExe.java index dc793fe4..44394d8a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/executor/query/EvalProjectArchiveFilePageQueryExe.java +++ b/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 execute(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { - return evalProjectArchiveFileQueryService.listEvalProjectArchiveFilePage(evalProjectArchiveFilePageQry); + return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry); } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/EvalProjectArchiveFileServiceI.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/EvalProjectArchiveFileServiceI.java index 1df90e08..7a9ee7fc 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/EvalProjectArchiveFileServiceI.java +++ b/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 listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); /** * 根据ID获取安全评价项目档案文件详情 diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/impl/EvalProjectArchiveFileServiceImpl.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/impl/EvalProjectArchiveFileServiceImpl.java index 1bfc49c5..762a46ad 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/file/service/impl/EvalProjectArchiveFileServiceImpl.java +++ b/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 listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { + public PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { return evalProjectArchiveFilePageQueryExe.execute(evalProjectArchiveFilePageQry); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java index 64c6eb26..50c2cbb0 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java +++ b/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; + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java index 038ee175..4d833526 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java +++ b/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 = "环境") - private String env; - @ApiModelProperty(value = "version") - private Integer version; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "创建人") + protected String createName; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/EvalProjectArchiveFileGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/EvalProjectArchiveFileGatewayImpl.java index e6d85866..df6354c7 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gateway/EvalProjectArchiveFileGatewayImpl.java +++ b/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()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalProjectArchiveFileQueryService.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalProjectArchiveFileQueryService.java index edfe59d1..f9721c97 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalProjectArchiveFileQueryService.java +++ b/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 listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProjectArchiveFileQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProjectArchiveFileQueryServiceImpl.java index c120791b..7e0a60b0 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProjectArchiveFileQueryServiceImpl.java +++ b/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 listEvalProjectArchiveFilePage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { - IPage evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFilePage(PageHelper.queryToPage(evalProjectArchiveFilePageQry), evalProjectArchiveFilePageQry); + public PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { + IPage evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFileOrgPage(PageHelper.queryToPage(evalProjectArchiveFilePageQry), evalProjectArchiveFilePageQry); List evalProjectArchiveFileCoS = evalProjectArchiveFileDoConvertor.converDosToCos(evalProjectArchiveFileDoPage.getRecords()); return PageHelper.pageToResponse(evalProjectArchiveFileDoPage, evalProjectArchiveFileCoS); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalProjectArchiveFileRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalProjectArchiveFileRepository.java index cdb9d369..d4ddd163 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalProjectArchiveFileRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalProjectArchiveFileRepository.java @@ -27,7 +27,7 @@ public interface EvalProjectArchiveFileRepository extends BaseRepository listEvalProjectArchiveFilePage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + IPage listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); /** * 新增安全评价项目档案文件 diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java index 2262e328..13fc317b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java @@ -33,7 +33,7 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl listEvalProjectArchiveFilePage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { + public IPage listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry) { QueryWrapper evalProjectArchiveFileDoQueryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotEmpty(evalProjectArchiveFilePageQry.getProjectId())) { evalProjectArchiveFileDoQueryWrapper.eq("project_id", evalProjectArchiveFilePageQry.getProjectId());