From 625f5e8335beb9265fc71a203e92fa641caef65e Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 18 Jul 2024 17:45:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/dto/ModelCaseDTO.java  | 20 +++++++++++++++++++
 .../service/impl/ModelCaseServiceImpl.java    |  1 +
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
index 5dcb30e..7ed6bd9 100644
--- a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
+++ b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
@@ -10,6 +10,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Data
 public class ModelCaseDTO {
@@ -49,6 +50,18 @@ public class ModelCaseDTO {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date acceptTime;
 
+    /**
+     * 冗余字段，方便前端取数，后端勿用
+      */
+    @Schema(description = "行为人id")
+    private String lawActorId;
+
+    /**
+     * 冗余字段，方便前端取数，后端勿用
+     */
+    @Schema(description = "行为人姓名")
+    private String lawActorName;
+
     @Schema(description = "案件行为人")
     private CasePerson lawActor;
 
@@ -95,4 +108,11 @@ public class ModelCaseDTO {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
 
+    public void floatLawActorInfo() {
+        if (Objects.nonNull(lawActor)){
+            this.lawActorName = lawActor.getName();
+            this.lawActorId = lawActor.getId();
+        }
+    }
+
 }
diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
index 521a7ef..3c86acb 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
@@ -88,6 +88,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             modelCaseDTO.setIdentifyResultName(comDictionaryService.getName(dicts, "identify_result", modelCaseDTO.getIdentifyResult()));
 
             modelCaseDTO.setLawActor(CollUtil.getFirst(persionMap.get("1")));
+            modelCaseDTO.floatLawActorInfo();
             modelCaseDTO.setLawPartyList(persionMap.get("2"));
             return modelCaseDTO;
         });