From ea69a96bcef0f16a2b0e4fb0b6f620d24ee6c0ce Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Fri, 3 Jul 2026 14:50:59 +0800
Subject: [PATCH] message

---
 .../app/executor/QualFilingChangeExecutor.java  | 17 ++++++++++++++---
 .../client/dto/QualFilingChangeAddCmd.java      |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
index 1e13039..314dce8 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
@@ -9,7 +9,6 @@ import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
 import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO;
 import org.qinan.safetyeval.client.dto.*;
 import org.qinan.safetyeval.domain.change.gateway.*;
-import org.qinan.safetyeval.domain.gateway.QualFilingChangeDetailGateway;
 import org.qinan.safetyeval.domain.change.model.*;
 import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum;
 import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum;
@@ -17,6 +16,7 @@ import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum;
 import org.qinan.safetyeval.domain.entity.*;
 import org.qinan.safetyeval.domain.exception.BizException;
 import org.qinan.safetyeval.domain.exception.ErrorCode;
+import org.qinan.safetyeval.domain.gateway.QualFilingChangeDetailGateway;
 import org.qinan.safetyeval.domain.query.PageResult;
 import org.qinan.safetyeval.domain.query.QualFilingChangeQuery;
 import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService;
@@ -30,7 +30,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.context.request.RequestContextHolder;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -419,8 +418,20 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
             if (existing == null) {
                 throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND);
             }
+            // 已备案的只能新增变更 否则就是修改
             if (QualFilingStatusEnum.isFiled(existing.getFilingStatusCode())) {
-                throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "已备案的变更记录不允许修改");
+                // 新增：根据filingId统计qualFilingChange表中filingStatusCode != 1的记录数，有则不允许新增
+                int count = qualFilingChangeDomainService.countByFilingIdAndStatusNot(
+                        addCmd.getFilingId(), QualFilingStatusEnum.FILED.getCode());
+                if (count > 0) {
+                    throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "存在进行中的备案变更，不允许新增");
+                }
+                cmd.setAdd(true);
+                cmd.getQualFilingChangeAddCmd().setId(null);
+                cmd.getQualFilingChangeAddCmd().setChangeFilingId(existing.getId());
+                cmd.getQualFilingChangeAddCmd().setFilingId(existing.getFilingId());
+            } else {
+                cmd.setAdd(false);
             }
         }
     }
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java
index 5da5823..e45b189 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java
@@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -17,6 +18,7 @@ public class QualFilingChangeAddCmd {
     private Long id;
 
     @ApiModelProperty(value = "备案申请id")
+    @NotNull
     private Long filingId;
 
     private Long orgId;