From ed2adc2b4d1635efaa8731565c560466b2f56961 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 11 Aug 2026 16:26:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyeval/adapter/web/QualFilingController.java | 6 ++++++ .../safetyeval/app/executor/OrgEquipmentExecutor.java | 1 + .../qinan/safetyeval/app/executor/QualFilingExecutor.java | 8 ++++++++ .../org/qinan/safetyeval/client/api/QualFilingApi.java | 2 ++ .../safetyeval/client/dto/OrgEquipmentPageQuery.java | 3 +++ .../qinan/safetyeval/domain/query/OrgEquipmentQuery.java | 4 ++++ .../infrastructure/dataobject/QualFilingDO.java | 4 ++-- .../gatewayimpl/OrgEquipmentGatewayImpl.java | 3 +++ 8 files changed, 29 insertions(+), 2 deletions(-) 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 05984478..5dc89e75 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 @@ -133,4 +133,10 @@ public class QualFilingController { return qualFilingApi.checkItem(id); } + @ApiOperation("查看是否能新增资质") + @GetMapping("/checkNewQual") + public SingleResponse checkNewQual() { + return qualFilingApi.checkNewQual(); + } + } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java index c551eb21..874e5549 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java @@ -116,6 +116,7 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { domainQuery.setInstrumentType(query.getInstrumentType()); domainQuery.setDeviceType(query.getDeviceType()); domainQuery.setEnableFlag(query.getEnableFlag()); + domainQuery.setIndustryCode(query.getIndustryCode()); PageResult pageResult = orgEquipmentDomainService.page(domainQuery); 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 697b70c6..725a23e7 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 @@ -304,6 +304,14 @@ public class QualFilingExecutor implements QualFilingApi { return SingleResponse.success(ComplianceCheckUtil.complianceCheck(cmdSync, false)); } + @Override + public SingleResponse checkNewQual() { + boolean exists = qualFilingMapper.exists(new LambdaQueryWrapper() + .eq(QualFilingDO::getOrgId, ThreadLocalUserInfoAdapter.getOrgId()) + .eq(QualFilingDO::getDeleteEnum, BooleanQAEnum.FALSE.getValue())); + return SingleResponse.success(!exists); + } + private QualFilingCO toLegacyCO(QualFilingEntity entity) { if (entity == null) { return null; 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 38505497..acdb1b8a 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 @@ -50,4 +50,6 @@ public interface QualFilingApi { SingleResponse qualificationMonitoringPageStatistics(); SingleResponse> checkItem(Long id); + + SingleResponse checkNewQual(); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java index 279eb1f6..409ab213 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java @@ -27,4 +27,7 @@ public class OrgEquipmentPageQuery extends BasePageQuery { @ApiModelProperty(value = "启用标识(1启用2禁用)") private Long enableFlag; + + @ApiModelProperty(value = "行业code") + private String industryCode; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgEquipmentQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgEquipmentQuery.java index 885ac8a2..536c7667 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgEquipmentQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgEquipmentQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -33,4 +34,7 @@ public class OrgEquipmentQuery { /** 设备状态 */ private Long enableFlag; + + @ApiModelProperty(value = "行业code") + private String industryCode; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java index bda2965f..e7695942 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java @@ -45,8 +45,8 @@ public class QualFilingDO extends BaseDO { private Long originFilingId; private String rejectReason; private Long filingReviewId; - private java.time.LocalDateTime submitTime; - private java.time.LocalDateTime approveTime; + private LocalDateTime submitTime; + private LocalDateTime approveTime; private Integer filingStatusCode; private String filingStatusName; private Integer applyTypeCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java index b3634443..ae1dc331 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgEquipmentGatewayImpl.java @@ -82,6 +82,9 @@ public class OrgEquipmentGatewayImpl implements OrgEquipmentGateway { if (query.getEnableFlag() != null) { wrapper.eq(OrgEquipmentDO::getEnableFlag, query.getEnableFlag()); } + if (StringUtils.hasText(query.getIndustryCode())) { + wrapper.eq(OrgEquipmentDO::getIndustryCode, query.getIndustryCode()); + } Page page = new Page<>(query.getPageNum(), query.getPageSize()); IPage result = orgEquipmentMapper.selectPage(page, wrapper);