From 9cd57ab23ea6f4d6f79f014305eceb6298660c68 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 14 Jul 2026 10:24:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E8=B4=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/web/QualFilingController.java | 6 ++++ .../app/executor/QualFilingExecutor.java | 8 ++++-- .../orchestrator/QualFilingOrchestrator.java | 13 +++++++++ .../safetyeval/client/api/QualFilingApi.java | 2 ++ .../safetyeval/client/co/QualFilingCO.java | 7 +++++ .../client/dto/QualFilingPageQuery.java | 2 -- .../dto/QualificationMonitoringQuery.java | 28 +++++++++++++++++++ .../mapper/QualFilingMapper.java | 7 +++++ .../resources/mapper/QualFilingMapper.xml | 19 +++++++++++++ 9 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualificationMonitoringQuery.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java index 3385ec7..9ff3ede 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java @@ -114,4 +114,10 @@ public class QualFilingController { return qualFilingApi.detail(id); } + @ApiOperation("资质监控页面") + @GetMapping("/qualificationMonitoringPage") + public PageResponse qualificationMonitoringPage(@Validated QualificationMonitoringQuery query) { + return qualFilingApi.qualificationMonitoringPage(query); + } + } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java index f9539de..7cc8b4a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java @@ -11,7 +11,6 @@ import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; import org.qinan.safetyeval.client.dto.*; -import org.qinan.safetyeval.domain.constant.AlertStatusEnum; import org.qinan.safetyeval.domain.constant.QualFilingApplyTypeEnum; import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum; import org.qinan.safetyeval.domain.entity.*; @@ -21,7 +20,6 @@ import org.qinan.safetyeval.infrastructure.dataobject.*; import org.qinan.safetyeval.infrastructure.mapper.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -251,6 +249,12 @@ public class QualFilingExecutor implements QualFilingApi { } } + @Override + public PageResponse qualificationMonitoringPage(QualificationMonitoringQuery query) { + PageResult pageResult = qualFilingOrchestrator.qualificationMonitoringPage(query); + return PageResponse.of(pageResult.getRecords(), pageResult.getTotal()); + } + private QualFilingCO toLegacyCO(QualFilingEntity entity) { if (entity == null) { return null; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index 4be7cb6..0ae888c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.app.orchestrator; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.app.support.*; import org.qinan.safetyeval.client.co.*; import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; import org.qinan.safetyeval.client.dto.QualFilingPageQuery; +import org.qinan.safetyeval.client.dto.QualificationMonitoringQuery; import org.qinan.safetyeval.domain.change.gateway.QualFilingCommitmentChangeGateway; import org.qinan.safetyeval.domain.change.gateway.QualFilingMaterialChangeGateway; import org.qinan.safetyeval.domain.change.gateway.QualFilingPersonnelChangeGateway; @@ -17,8 +19,10 @@ import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.query.QualFilingQuery; import org.qinan.safetyeval.domain.support.QualFilingExpertCheckSupport; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; +import org.qinan.safetyeval.infrastructure.mapper.QualFilingMapper; import org.qinan.safetyeval.infrastructure.support.OrgContextResolver; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -100,6 +104,9 @@ public class QualFilingOrchestrator { @Resource private OrgContextResolver orgContextResolver; + @Autowired + private QualFilingMapper qualFilingMapper; + @Value("${safety-eval.public-api.tenant-id:0}") private Long fallbackTenantId; @@ -1093,4 +1100,10 @@ public class QualFilingOrchestrator { } return fallbackTenantId != null && fallbackTenantId > 0 ? fallbackTenantId : null; } + + public PageResult qualificationMonitoringPage(QualificationMonitoringQuery query) { + Page page = new Page<>(query.getCurrent(), query.getSize()); + List co = qualFilingMapper.qualificationMonitoringPage(page, query); + return PageResult.of(co, page.getTotal(), page.getCurrent(), page.getSize()); + } } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java index d2e363e..29f3994 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java @@ -43,4 +43,6 @@ public interface QualFilingApi { SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingCmd cmd); void review(QualFilingReviewAddCmd cmd); + + PageResponse qualificationMonitoringPage(QualificationMonitoringQuery query); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java index 60b345e..42c8046 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java @@ -126,4 +126,11 @@ public class QualFilingCO { @ApiModelProperty(value = "租户ID") private Long tenantId; + +///////////////机构相关信息 + @ApiModelProperty(value = "区划名称") + private String districtName; + + @ApiModelProperty(value = "单位名称") + private String unitName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java index 59d8be4..2539005 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java @@ -1,8 +1,6 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; -import java.util.List; - import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualificationMonitoringQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualificationMonitoringQuery.java new file mode 100644 index 0000000..28d9eb8 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualificationMonitoringQuery.java @@ -0,0 +1,28 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 资质备案申请监控分页查询参数 + * + * @author safety-eval + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QualificationMonitoringQuery extends BasePageQuery { + + /////////////////////机构相关信息 + @ApiModelProperty(value = "统一社会信用代码") + private String creditCode; + + @ApiModelProperty(value = "单位名称") + private String unitName; + + @ApiModelProperty(value = "预警状态 normal:正常，person_rate:人员比例预警") + private String alertStatus; + + @ApiModelProperty(value = "经营范围") + private String businessScope; +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingMapper.java index f141ab0..74103d0 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/QualFilingMapper.java @@ -1,9 +1,16 @@ package org.qinan.safetyeval.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.qinan.safetyeval.client.co.QualFilingCO; +import org.qinan.safetyeval.client.dto.QualificationMonitoringQuery; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingDO; +import java.util.List; + @Mapper public interface QualFilingMapper extends BaseMapper { + List qualificationMonitoringPage(@Param("page") Page page, @Param("query") QualificationMonitoringQuery query); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml index 8d2d07f..3d6922e 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingMapper.xml @@ -53,4 +53,23 @@ `id`, `org_id`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `origin_filing_id`, `reject_reason`, `submit_time`, `approve_time`, `filing_status_code`, `filing_status_name`, `apply_type_code`, `apply_type_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + +