From 3c4a06bd392a2c8f7c69a887ae452dc02eabf9b9 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Wed, 1 Jul 2026 17:45:32 +0800 Subject: [PATCH] qual_filing_review --- ...rement-qual-filing-management-20260629.sql | 3 +- .../app/executor/QualFilingExecutor.java | 5 +++ .../orchestrator/QualFilingOrchestrator.java | 5 +++ .../safetyeval/client/co/QualFilingCO.java | 3 ++ .../client/dto/QualFilingAddCmd.java | 3 ++ .../client/dto/QualFilingModifyCmd.java | 3 ++ .../constant/QualFilingReviewResultEnum.java | 41 +++++++++++++++++++ .../domain/entity/QualFilingEntity.java | 3 ++ .../dataobject/QualFilingDO.java | 1 + .../gatewayimpl/QualFilingGatewayImpl.java | 2 + 10 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java diff --git a/docs/db/increment-qual-filing-management-20260629.sql b/docs/db/increment-qual-filing-management-20260629.sql index 265a8bf..b98ce79 100644 --- a/docs/db/increment-qual-filing-management-20260629.sql +++ b/docs/db/increment-qual-filing-management-20260629.sql @@ -14,7 +14,8 @@ SET NAMES utf8mb4; ALTER TABLE `qual_filing` ADD COLUMN `origin_filing_id` bigint DEFAULT NULL COMMENT '变更草稿关联的原备案id' AFTER `attachment_url`, ADD COLUMN `reject_reason` varchar(500) DEFAULT NULL COMMENT '打回原因' AFTER `origin_filing_id`, - ADD COLUMN `submit_time` datetime DEFAULT NULL COMMENT '最近提交时间' AFTER `reject_reason`, + ADD COLUMN `filing_review_id` bigint DEFAULT NULL COMMENT '审核id' AFTER `reject_reason`, + ADD COLUMN `submit_time` datetime DEFAULT NULL COMMENT '最近提交时间' AFTER `filing_review_id`, ADD COLUMN `approve_time` datetime DEFAULT NULL COMMENT '最近审核通过时间' AFTER `submit_time`; ALTER TABLE `qual_filing` diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java index 4fa7f0c..0f48c84 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java @@ -164,6 +164,11 @@ public class QualFilingExecutor implements QualFilingApi { co.setWorkplaceArea(entity.getWorkplaceArea()); co.setUnitIntro(entity.getUnitIntro()); co.setAttachmentUrl(entity.getAttachmentUrl()); + co.setOriginFilingId(entity.getOriginFilingId()); + co.setRejectReason(entity.getRejectReason()); + co.setFilingReviewId(entity.getFilingReviewId()); + co.setSubmitTime(entity.getSubmitTime()); + co.setApproveTime(entity.getApproveTime()); co.setFilingStatusCode(entity.getFilingStatusCode()); co.setFilingStatusName(entity.getFilingStatusName()); co.setApplyTypeCode(entity.getApplyTypeCode()); 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 6a7220d..ab424aa 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 @@ -503,6 +503,7 @@ public class QualFilingOrchestrator { origin.setWorkplaceArea(draft.getWorkplaceArea()); origin.setUnitIntro(draft.getUnitIntro()); origin.setAttachmentUrl(draft.getAttachmentUrl()); + origin.setFilingReviewId(draft.getFilingReviewId()); } private QualFilingChangeEntity copyToChangeHeader(QualFilingEntity origin, QualFilingEntity draft) { @@ -598,6 +599,9 @@ public class QualFilingOrchestrator { if (cmd.getAttachmentUrl() != null) { entity.setAttachmentUrl(cmd.getAttachmentUrl()); } + if (cmd.getFilingReviewId() != null) { + entity.setFilingReviewId(cmd.getFilingReviewId()); + } } private QualFilingChangeHistoryItemCO toHistoryItem(QualFilingChangeDetailEntity entity) { @@ -644,6 +648,7 @@ public class QualFilingOrchestrator { co.setAttachmentUrl(entity.getAttachmentUrl()); co.setOriginFilingId(entity.getOriginFilingId()); co.setRejectReason(entity.getRejectReason()); + co.setFilingReviewId(entity.getFilingReviewId()); co.setSubmitTime(entity.getSubmitTime()); co.setApproveTime(entity.getApproveTime()); co.setFilingStatusCode(entity.getFilingStatusCode()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java index df87cd7..edeb55c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java @@ -100,6 +100,9 @@ public class QualFilingCO { @ApiModelProperty(value = "打回原因") private String rejectReason; + @ApiModelProperty(value = "审核id") + private Long filingReviewId; + @ApiModelProperty(value = "提交时间") private java.time.LocalDateTime submitTime; 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 f676647..953d6f6 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 @@ -74,6 +74,9 @@ public class QualFilingAddCmd { /** attachmentUrl */ private String attachmentUrl; + /** 审核id */ + private Long filingReviewId; + /** filingStatusCode */ private Integer filingStatusCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java index 7ae1ef2..fdbfcf8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java @@ -77,6 +77,9 @@ public class QualFilingModifyCmd { /** attachmentUrl */ private String attachmentUrl; + /** 审核id */ + private Long filingReviewId; + /** filingStatusCode */ private Integer filingStatusCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java new file mode 100644 index 0000000..f70d434 --- /dev/null +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualFilingReviewResultEnum.java @@ -0,0 +1,41 @@ +package org.qinan.safetyeval.domain.constant; + +/** + * 审核结果枚举 + * + * @author safety-eval + */ +public enum QualFilingReviewResultEnum { + + PASS(1, "通过"), + PENDING(2, "待定"), + REJECT(3, "不通过"); + + private final int code; + private final String name; + + QualFilingReviewResultEnum(int code, String name) { + this.code = code; + this.name = name; + } + + public int getCode() { + return code; + } + + public String getName() { + return name; + } + + public static QualFilingReviewResultEnum ofCode(Integer code) { + if (code == null) { + return null; + } + for (QualFilingReviewResultEnum item : values()) { + if (item.code == code) { + return item; + } + } + return null; + } +} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java index 7cc8e66..1ed9341 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java @@ -87,6 +87,9 @@ public class QualFilingEntity { /** 打回原因 */ private String rejectReason; + /** 审核id */ + private Long filingReviewId; + /** 最近提交时间 */ private java.time.LocalDateTime submitTime; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java index 07bd38a..d69860b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingDO.java @@ -40,6 +40,7 @@ public class QualFilingDO { private String attachmentUrl; private Long originFilingId; private String rejectReason; + private Long filingReviewId; private java.time.LocalDateTime submitTime; private java.time.LocalDateTime approveTime; private Integer filingStatusCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index 9a505be..db7481b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -180,6 +180,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway { dataObject.setAttachmentUrl(entity.getAttachmentUrl()); dataObject.setOriginFilingId(entity.getOriginFilingId()); dataObject.setRejectReason(entity.getRejectReason()); + dataObject.setFilingReviewId(entity.getFilingReviewId()); dataObject.setSubmitTime(entity.getSubmitTime()); dataObject.setApproveTime(entity.getApproveTime()); dataObject.setFilingStatusCode(entity.getFilingStatusCode()); @@ -220,6 +221,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway { entity.setAttachmentUrl(dataObject.getAttachmentUrl()); entity.setOriginFilingId(dataObject.getOriginFilingId()); entity.setRejectReason(dataObject.getRejectReason()); + entity.setFilingReviewId(dataObject.getFilingReviewId()); entity.setSubmitTime(dataObject.getSubmitTime()); entity.setApproveTime(dataObject.getApproveTime()); entity.setFilingStatusCode(dataObject.getFilingStatusCode());