From 0a6fe69806ef54dfe6c76bebc79bc69718908162 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Thu, 31 Jul 2025 18:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8E=85=E9=95=BF=E4=BF=A1?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/biutag/lan/controller/ApiV1Controller.java   | 6 ++++++
 .../src/main/java/com/biutag/lan/domain/MailMark.java     | 2 ++
 .../main/java/com/biutag/lan/domain/bo/MailApiV1Req.java  | 1 -
 .../main/java/com/biutag/lan/domain/vo/MailDomain.java    | 8 +++++---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java
index e2f5557..175dbe7 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java
@@ -68,6 +68,10 @@ public class ApiV1Controller {
 
     private final MailApprovalService mailApprovalService;
 
+    private final MailMarkService mailMarkService;
+
+    private final MailBlameService mailBlameService;
+
     private final String key = "mailbox";
 
     @Value("${spring.profiles.active}")
@@ -233,6 +237,8 @@ public class ApiV1Controller {
             mail.setInterviewAttachments(array.toJSONString());
         }
         mailDomain.setMail(mail);
+        mailDomain.setMailMark(mailMarkService.getById(mailId));
+        mailDomain.setMailBlames(mailBlameService.list(List.of(mailId)));
         mailDomain.setFlows(flowService.list(mailId));
         mailDomain.setApprovals(mailApprovalService.list(mailId));
         return AjaxResult.success(mailDomain);
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/MailMark.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/MailMark.java
index 562ee13..d0f262d 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/domain/MailMark.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/MailMark.java
@@ -2,6 +2,7 @@ package com.biutag.lan.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -52,6 +53,7 @@ public class MailMark {
     /**
      * 办结时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime completionTime;
 
     /**
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailApiV1Req.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailApiV1Req.java
index 6478abc..c824b94 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailApiV1Req.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailApiV1Req.java
@@ -35,7 +35,6 @@ public class MailApiV1Req {
     /**
      * 联系人身份证号
      */
-    @IdCard
     private String contactIdCard;
 
     /**
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/MailDomain.java b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/MailDomain.java
index a0a6870..77ba760 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/MailDomain.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/domain/vo/MailDomain.java
@@ -1,8 +1,6 @@
 package com.biutag.lan.domain.vo;
 
-import com.biutag.lan.domain.Mail;
-import com.biutag.lan.domain.MailApproval;
-import com.biutag.lan.domain.MailFlow;
+import com.biutag.lan.domain.*;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,6 +17,10 @@ public class MailDomain {
 
     private Mail mail;
 
+    private MailMark mailMark;
+
+    private List<MailBlame> mailBlames = new ArrayList<>();
+
     private List<MailFlow> flows = new ArrayList<>();
 
     private List<MailApproval> approvals = new ArrayList<>();