BooleanQAEnum
parent
12fd3c5a5a
commit
3d531820c2
|
|
@ -281,6 +281,10 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
||||||
if (changeEntity == null) {
|
if (changeEntity == null) {
|
||||||
throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND);
|
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);
|
QualFilingChangeEntity updateE = qualFilingChangeDomainService.get(changeFilingId);
|
||||||
updateE.setId(changeFilingId);
|
updateE.setId(changeFilingId);
|
||||||
|
|
||||||
|
|
@ -297,7 +301,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
||||||
updateE.setFilingReviewId(reviewEntity.getId());
|
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.setFilingStatusCode(QualFilingStatusEnum.FILED.getCode());
|
||||||
updateE.setFilingStatusName(QualFilingStatusEnum.FILED.getName());
|
updateE.setFilingStatusName(QualFilingStatusEnum.FILED.getName());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ public class QualFilingChangeReviewAddCmd {
|
||||||
|
|
||||||
@ApiModelProperty(value = "变更备案申请id")
|
@ApiModelProperty(value = "变更备案申请id")
|
||||||
@NotNull(message = "备案申请id 不能为空")
|
@NotNull(message = "备案申请id 不能为空")
|
||||||
private Long changeFilingId;
|
private Long id;
|
||||||
|
|
||||||
@ApiModelProperty(value = "备案审核id", hidden = true)
|
@ApiModelProperty(value = "备案审核id", hidden = true)
|
||||||
private Long filingReviewId;
|
private Long filingReviewId;
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ public enum ErrorCode {
|
||||||
|
|
||||||
// ---- 备案变更 ----
|
// ---- 备案变更 ----
|
||||||
QUAL_FILING_CHANGE_NOT_FOUND("02-02-001", "备案变更不存在"),
|
QUAL_FILING_CHANGE_NOT_FOUND("02-02-001", "备案变更不存在"),
|
||||||
|
STATUS_NOT_APPROVED("02-03-001", "当前状态不允许审核"),
|
||||||
|
|
||||||
// ---- 备案变更明细 ----
|
// ---- 备案变更明细 ----
|
||||||
QUAL_FILING_CHANGE_DETAIL_NOT_FOUND("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_URL_GENERATE_FAILED("03-01-007", "文件地址生成失败"),
|
||||||
FILE_SIZE_EXCEEDED("03-01-008", "文件大小超出限制"),
|
FILE_SIZE_EXCEEDED("03-01-008", "文件大小超出限制"),
|
||||||
|
|
||||||
/** 未知错误 */
|
/**
|
||||||
|
* 未知错误
|
||||||
|
*/
|
||||||
UNKNOWN_ERROR("99-99-999", "系统异常,请稍后重试");
|
UNKNOWN_ERROR("99-99-999", "系统异常,请稍后重试");
|
||||||
|
|
||||||
private final String code;
|
private final String code;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package org.qinan.safetyeval.infrastructure.utils;
|
package org.qinan.safetyeval.infrastructure.utils;
|
||||||
|
|
||||||
import lombok.experimental.UtilityClass;
|
import lombok.experimental.UtilityClass;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.web.context.request.RequestContextHolder;
|
import org.springframework.web.context.request.RequestContextHolder;
|
||||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||||
|
|
||||||
|
|
@ -14,7 +15,8 @@ public class RequestHandlerUtil {
|
||||||
* @return String
|
* @return String
|
||||||
*/
|
*/
|
||||||
public static Long getOrgId() {
|
public static Long getOrgId() {
|
||||||
return Long.parseLong(((ServletRequestAttributes) RequestContextHolder
|
String orgInfoId = ((ServletRequestAttributes) RequestContextHolder
|
||||||
.getRequestAttributes()).getRequest().getHeader("orgInfoId"));
|
.getRequestAttributes()).getRequest().getHeader("orgInfoId");
|
||||||
|
return StringUtils.isBlank(orgInfoId) ? null : Long.valueOf(orgInfoId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue