From 828c9b6e5792a0cff837759992a37f0b6c3ea6b4 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 7 Jul 2026 18:32:04 +0800 Subject: [PATCH] bug --- .../app/orchestrator/QualFilingOrchestrator.java | 2 +- .../org/qinan/safetyeval/client/dto/QualFilingAddCmd.java | 5 +++-- .../infrastructure/gatewayimpl/OrgInfoGatewayImpl.java | 1 + .../gatewayimpl/OrgResignApplyGatewayImpl.java | 7 +++++++ 4 files changed, 12 insertions(+), 3 deletions(-) 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 5672d8a..bbb3b79 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 @@ -216,7 +216,7 @@ public class QualFilingOrchestrator { domainQuery.setSupervision(query.getSupervision()); PageResult pageResult = qualFilingGateway.page(domainQuery); List records = pageResult.getRecords().stream() - .map(entity -> toCO(entity)) + .map(this::toCO) .collect(Collectors.toList()); return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize()); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java index 8d7862c..81e12db 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java @@ -1,9 +1,10 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; -import java.math.BigDecimal; import lombok.Data; +import java.math.BigDecimal; + /** * 资质备案申请新增命令 * @@ -87,7 +88,7 @@ public class QualFilingAddCmd { @ApiModelProperty(value = "备案状态名称") private String filingStatusName; - @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿3已备案资质填报-暂时不用)") + @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿-暂时不用3已备案资质填报)") private Integer applyTypeCode; @ApiModelProperty(value = "申请类型名称") 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 67c3cf9..600341f 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 @@ -366,6 +366,7 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway { entity.setFilingRecordStatusCode(dataObject.getFilingRecordStatusCode()); entity.setFilingRecordStatusName(dataObject.getFilingRecordStatusName()); entity.setAttachmentUrls(dataObject.getAttachmentUrls()); + entity.setCreateId(dataObject.getCreateId()); entity.setState(dataObject.getState()); entity.setTenantId(dataObject.getTenantId()); entity.setCreateTime(dataObject.getCreateTime()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgResignApplyGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgResignApplyGatewayImpl.java index 599c457..91a18de 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgResignApplyGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgResignApplyGatewayImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.domain.entity.OrgResignApplyEntity; +import org.qinan.safetyeval.domain.exception.BizException; +import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.OrgResignApplyGateway; import org.qinan.safetyeval.domain.query.OrgResignApplyQuery; import org.qinan.safetyeval.domain.query.PageResult; @@ -36,6 +38,11 @@ public class OrgResignApplyGatewayImpl implements OrgResignApplyGateway { @Override public OrgResignApplyEntity save(OrgResignApplyEntity entity) { + if (orgResignApplyMapper.exists(new LambdaQueryWrapper() + .eq(OrgResignApplyDO::getPersonnelId, entity.getPersonnelId()) + .eq(OrgResignApplyDO::getAuditStatusCode, 0))) { + throw new BizException(ErrorCode.UNKNOWN_ERROR, "人员离职申请已存在"); + } OrgResignApplyDO dataObject = toDO(entity); InsertFieldDefaults.apply(dataObject); orgResignApplyMapper.insert(dataObject);