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 420cd3ec..71e4f0f9 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 @@ -8,9 +8,11 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.qinan.safetyeval.app.file.service.EvalProjectArchiveFileServiceI; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; +import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,10 +35,17 @@ public class EvalProjectArchiveFileController implements Serializable { @GetMapping("/org/page") @ApiOperation("查询安全评价项目档案文件列表-机构端分页") - public PageResponse list(@Validated EvalProjectArchiveFilePageQry qry) { + public PageResponse orgList(@Validated EvalProjectArchiveFilePageQry qry) { + qry.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); // 设置机构ID return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileOrgPage(qry); } + @GetMapping("/monitor/page") + @ApiOperation("查询安全评价项目档案文件列表-监管端分页") + public PageResponse monitorList(@Validated EvalProjectArchiveFileMonitorPageQry qry) { + return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileMonitorPage(qry); + } + @GetMapping("/{id}") @ApiOperation("查询安全评价项目档案文件详情页面") public SingleResponse getInfo(@PathVariable("id") Long 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 cb29d90e..f27a134f 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 @@ -2,6 +2,7 @@ package org.qinan.safetyeval.app.file.executor.query; import com.alibaba.cola.dto.PageResponse; import lombok.AllArgsConstructor; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalProjectArchiveFileQueryService; @@ -29,4 +30,14 @@ public class EvalProjectArchiveFilePageQueryExe { return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry); } + /** + * 监管端分页查找安全评价项目档案文件 + * + * @param evalProjectArchiveFileMonitorPageQry 查找条件对象 + * @return 结果集 + */ + public PageResponse listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) { + return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileMonitorPage(evalProjectArchiveFileMonitorPageQry); + } + } 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 7a9ee7fc..91cc6f3d 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 @@ -2,6 +2,7 @@ package org.qinan.safetyeval.app.file.service; import com.alibaba.cola.dto.PageResponse; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; @@ -21,6 +22,14 @@ public interface EvalProjectArchiveFileServiceI { */ PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + /** + * 监管端分页获取安全评价项目档案文件列表 + * + * @param evalProjectArchiveFileMonitorPageQry 查找条件对象 + * @return 结果集 + */ + PageResponse listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry); + /** * 根据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 c2184e19..11f482d6 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 @@ -9,6 +9,7 @@ import org.qinan.safetyeval.app.file.executor.query.EvalProjectArchiveFileListQu import org.qinan.safetyeval.app.file.executor.query.EvalProjectArchiveFilePageQueryExe; import org.qinan.safetyeval.app.file.service.EvalProjectArchiveFileServiceI; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; @@ -35,6 +36,11 @@ public class EvalProjectArchiveFileServiceImpl implements EvalProjectArchiveFile return evalProjectArchiveFilePageQueryExe.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry); } + @Override + public PageResponse listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) { + return evalProjectArchiveFilePageQueryExe.listEvalProjectArchiveFileMonitorPage(evalProjectArchiveFileMonitorPageQry); + } + @Override public EvalProjectArchiveFileCo getEvalProjectArchiveFileById(Long id) { return evalProjectArchiveFileListQueryExe.execute(id); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileMonitorPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileMonitorPageQry.java new file mode 100644 index 00000000..60588f3e --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileMonitorPageQry.java @@ -0,0 +1,44 @@ +package org.qinan.safetyeval.client.file.request; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; + +/** + * 安全评价项目档案文件监管端分页查询Qry + * + * @Author: ltq + * @date 2026-08-25 14:15:25 + */ +@Data +public class EvalProjectArchiveFileMonitorPageQry extends PageQuery { + private static final long serialVersionUID = 1L; + + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private String projectId; + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称") + private String fileName; + /** + * ArchiveTypeEnum.REMARKS + */ + @ApiModelProperty(value = ArchiveTypeEnum.REMARKS) + private String archiveType; + /** + * 业务节点 + */ + @ApiModelProperty(value = "业务节点") + private String businessNode; + /** + * 来源 auto_process_record流程自动记录，upload_additional_files 补充上传 + */ + @ApiModelProperty(value = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传") + private String recordSource; +} 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 f9721c97..35d60415 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 @@ -1,6 +1,7 @@ package org.qinan.safetyeval.infrastructure.persistence.queryservice; import com.alibaba.cola.dto.PageResponse; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO; @@ -28,4 +29,12 @@ public interface EvalProjectArchiveFileQueryService { * @return */ PageResponse listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + + /** + * 监管端分页查询安全评价项目档案文件 + * + * @param evalProjectArchiveFileMonitorPageQry 分页Qry + * @return + */ + PageResponse listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry); } 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 7e0a60b0..a64b8f75 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 @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import lombok.AllArgsConstructor; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo; import org.qinan.safetyeval.infrastructure.convertor.EvalProjectArchiveFileDoConvertor; @@ -39,4 +40,11 @@ public class EvalProjectArchiveFileQueryServiceImpl implements EvalProjectArchiv return PageHelper.pageToResponse(evalProjectArchiveFileDoPage, evalProjectArchiveFileCoS); } + @Override + public PageResponse listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) { + IPage evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFileMonitorPage(PageHelper.queryToPage(evalProjectArchiveFileMonitorPageQry), evalProjectArchiveFileMonitorPageQry); + 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 d4ddd163..0afcffca 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 @@ -2,6 +2,7 @@ package org.qinan.safetyeval.infrastructure.persistence.repository; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.BaseRepository; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO; @@ -29,6 +30,15 @@ public interface EvalProjectArchiveFileRepository extends BaseRepository listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry); + /** + * 监管端分页查找安全评价项目档案文件对象 + * + * @param iPage 分页对象 + * @param evalProjectArchiveFileMonitorPageQry 条件对象 + * @return ipage + */ + IPage listEvalProjectArchiveFileMonitorPage(IPage iPage, EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry); + /** * 新增安全评价项目档案文件 * 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 13fc317b..b815ad97 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; +import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO; @@ -51,6 +52,30 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl listEvalProjectArchiveFileMonitorPage(IPage iPage, EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) { + QueryWrapper evalProjectArchiveFileDoQueryWrapper = new QueryWrapper<>(); + if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getProjectId())) { + evalProjectArchiveFileDoQueryWrapper.eq("project_id", evalProjectArchiveFileMonitorPageQry.getProjectId()); + } + if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getFileName())) { + evalProjectArchiveFileDoQueryWrapper.like("file_name", evalProjectArchiveFileMonitorPageQry.getFileName()); + } + if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getArchiveType())) { + evalProjectArchiveFileDoQueryWrapper.eq("archive_type", evalProjectArchiveFileMonitorPageQry.getArchiveType()); + } + if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getBusinessNode())) { + evalProjectArchiveFileDoQueryWrapper.eq("business_node", evalProjectArchiveFileMonitorPageQry.getBusinessNode()); + } + if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getRecordSource())) { + evalProjectArchiveFileDoQueryWrapper.eq("record_source", evalProjectArchiveFileMonitorPageQry.getRecordSource()); + } + evalProjectArchiveFileDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue()); return evalProjectArchiveFileMapper.selectPage(iPage, evalProjectArchiveFileDoQueryWrapper); }