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 be0fd90..b945ddb 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 @@ -281,6 +281,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { if (changeEntity == null) { throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND); } + if (QualFilingStatusEnum.REVIEWING.getCode() != changeEntity.getFilingStatusCode()) { + throw new BizException(ErrorCode.STATUS_NOT_APPROVED); + } + QualFilingChangeEntity updateE = qualFilingChangeDomainService.get(changeFilingId); updateE.setId(changeFilingId); @@ -297,7 +301,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { updateE.setFilingReviewId(reviewEntity.getId()); // 审核通过:将变更数据同步到正式备案表 - if (QualFilingReviewResultEnum.PASS.getName().equals(cmd.getReviewResult())) { + if (String.valueOf(QualFilingReviewResultEnum.PASS.getCode()).equals(cmd.getReviewResult())) { updateE.setFilingStatusCode(QualFilingStatusEnum.FILED.getCode()); updateE.setFilingStatusName(QualFilingStatusEnum.FILED.getName()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java index 58d2470..cb6f6c4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeReviewAddCmd.java @@ -17,7 +17,7 @@ public class QualFilingChangeReviewAddCmd { @ApiModelProperty(value = "变更备案申请id") @NotNull(message = "备案申请id 不能为空") - private Long changeFilingId; + private Long id; @ApiModelProperty(value = "备案审核id", hidden = true) private Long filingReviewId; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java index f694057..2a329bd 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/exception/ErrorCode.java @@ -43,6 +43,7 @@ public enum ErrorCode { // ---- 备案变更 ---- QUAL_FILING_CHANGE_NOT_FOUND("02-02-001", "备案变更不存在"), + STATUS_NOT_APPROVED("02-03-001", "当前状态不允许审核"), // ---- 备案变更明细 ---- QUAL_FILING_CHANGE_DETAIL_NOT_FOUND("02-03-001", "备案变更明细不存在"), @@ -88,7 +89,9 @@ public enum ErrorCode { FILE_URL_GENERATE_FAILED("03-01-007", "文件地址生成失败"), FILE_SIZE_EXCEEDED("03-01-008", "文件大小超出限制"), - /** 未知错误 */ + /** + * 未知错误 + */ UNKNOWN_ERROR("99-99-999", "系统异常,请稍后重试"); private final String code; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java index 3e8aa0e..db8056e 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java @@ -1,6 +1,7 @@ package org.qinan.safetyeval.infrastructure.utils; import lombok.experimental.UtilityClass; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -14,7 +15,8 @@ public class RequestHandlerUtil { * @return String */ public static Long getOrgId() { - return Long.parseLong(((ServletRequestAttributes) RequestContextHolder - .getRequestAttributes()).getRequest().getHeader("orgInfoId")); + String orgInfoId = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()).getRequest().getHeader("orgInfoId"); + return StringUtils.isBlank(orgInfoId) ? null : Long.valueOf(orgInfoId); } }