cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

message

dev
luotaiqian 2026-07-03 14:50:59 +08:00
parent 5e2e6935ed
commit ea69a96bce
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
View File

@ -9,7 +9,6 @@ import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO; import org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO;
import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.client.dto.*;
import org.qinan.safetyeval.domain.change.gateway.*; 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.change.model.*;
import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum; import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum;
import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum; 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.entity.*;
import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.domain.exception.ErrorCode; 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.PageResult;
import org.qinan.safetyeval.domain.query.QualFilingChangeQuery; import org.qinan.safetyeval.domain.query.QualFilingChangeQuery;
import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService; 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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -419,8 +418,20 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
if (existing == null) { if (existing == null) {
throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND);
} }
// 已备案的只能新增变更 否则就是修改
if (QualFilingStatusEnum.isFiled(existing.getFilingStatusCode())) { 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);
} }
} }
} }

2
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java
View File

@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@ -17,6 +18,7 @@ public class QualFilingChangeAddCmd {
private Long id; private Long id;
@ApiModelProperty(value = "备案申请id") @ApiModelProperty(value = "备案申请id")
@NotNull
private Long filingId; private Long filingId;
private Long orgId; private Long orgId;