From 1cd112a05d1ba833d83f378f413b5ce6d20e1f41 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Wed, 22 Jul 2026 15:34:29 +0800 Subject: [PATCH] waring --- .../executor/query/QualOnSiteReviewListQueryExe.java | 3 +++ .../review/response/QualOnSiteReviewResultCo.java | 3 +++ .../safetyeval/domain/gateway/OrgInfoGateway.java | 8 ++++++++ .../gatewayimpl/OrgInfoGatewayImpl.java | 12 ++++++++++++ 4 files changed, 26 insertions(+) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewListQueryExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewListQueryExe.java index 8377242..3ee06cd 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewListQueryExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/query/QualOnSiteReviewListQueryExe.java @@ -6,6 +6,7 @@ import org.qinan.safetyeval.client.file.response.QualOnSiteReviewFileCo; import org.qinan.safetyeval.client.review.response.QualOnSiteReviewCo; import org.qinan.safetyeval.client.review.response.QualOnSiteReviewResultCo; import org.qinan.safetyeval.domain.constant.QualOnSiteReviewStatusEnum; +import org.qinan.safetyeval.domain.gateway.OrgInfoGateway; import org.qinan.safetyeval.infrastructure.convertor.QualOnSiteReviewDoConvertor; import org.qinan.safetyeval.infrastructure.persistence.domainobject.QualOnSiteReviewDO; import org.qinan.safetyeval.infrastructure.persistence.queryservice.QualOnSiteReviewFileQueryService; @@ -27,6 +28,7 @@ public class QualOnSiteReviewListQueryExe { private final QualOnSiteReviewQueryService qualOnSiteReviewQueryService; private final QualOnSiteReviewDoConvertor qualOnSiteReviewDoConvertor; private final QualOnSiteReviewFileQueryService qualOnSiteReviewFileQueryService; + private final OrgInfoGateway orgInfoGateway; /** * 根据ID查找资质现场核查对象 @@ -53,6 +55,7 @@ public class QualOnSiteReviewListQueryExe { QualOnSiteReviewResultCo resultCo = new QualOnSiteReviewResultCo(); resultCo.setId(qualOnSiteReviewDO.getId()); resultCo.setOrgId(qualOnSiteReviewDO.getOrgId()); + resultCo.setOrgName(orgInfoGateway.getUnitNameById(qualOnSiteReviewDO.getOrgId())); resultCo.setReviewDateStart(qualOnSiteReviewDO.getReviewDateStart()); resultCo.setReviewLeader(qualOnSiteReviewDO.getReviewLeader()); resultCo.setReviewOpinion(qualOnSiteReviewDO.getReviewOpinion()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewResultCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewResultCo.java index 667f100..9b20938 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewResultCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewResultCo.java @@ -28,6 +28,9 @@ public class QualOnSiteReviewResultCo extends ClientObject implements Serializab @JsonFormat(shape = JsonFormat.Shape.STRING) private Long orgId; + @ApiModelProperty(value = "受审查机构名称") + private String orgName; + @ApiModelProperty(value = "现场审查日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime reviewDateStart; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/OrgInfoGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/OrgInfoGateway.java index 5e03163..18b1576 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/OrgInfoGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/OrgInfoGateway.java @@ -39,4 +39,12 @@ public interface OrgInfoGateway { * @return 机构列表 */ List selectList(); + + /** + * 根据机构ID查询单位名称(按需查询字段) + * + * @param id 机构ID + * @return 单位名称 + */ + String getUnitNameById(Long id); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java index 48c0b26..4af7a3f 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java @@ -306,6 +306,18 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { .collect(Collectors.toList()); } + @Override + public String getUnitNameById(Long id) { + if (id == null) { + return null; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(OrgInfoDO::getUnitName) + .eq(OrgInfoDO::getId, id); + OrgInfoDO orgInfoDO = orgInfoMapper.selectOne(wrapper); + return orgInfoDO == null ? null : orgInfoDO.getUnitName(); + } + private void syncGbsUser(String action, Runnable runnable) { try { runnable.run();