Merge remote-tracking branch 'origin/dev' into dev

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`

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());

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());

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;
 

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;
 

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;
 

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;
+    }
+}

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;
 

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;

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());