From d6692442fd543757a7b5cf9a08555df54ebaf152 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Wed, 7 Aug 2024 16:34:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/domain/NoteRecord.java |  5 +++++
 .../supervision/police/dto/ModelCaseDTO.java  | 11 +++++++++--
 .../supervision/police/dto/NoteRecordDTO.java |  6 ++++++
 .../police/dto/NoteRecordDetailDTO.java       |  6 ++++++
 .../service/impl/ModelCaseServiceImpl.java    |  8 ++++++--
 .../impl/NoteRecordSplitServiceImpl.java      | 19 -------------------
 6 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/supervision/police/domain/NoteRecord.java b/src/main/java/com/supervision/police/domain/NoteRecord.java
index 38eb80a..54504c0 100644
--- a/src/main/java/com/supervision/police/domain/NoteRecord.java
+++ b/src/main/java/com/supervision/police/domain/NoteRecord.java
@@ -43,6 +43,11 @@ public class NoteRecord implements Serializable {
      * 笔录文件id
      */
     private String fileIds;
+
+    /**
+     * 案件人员id
+     */
+    private String casePersonId;
     
     /**
      * 姓名
diff --git a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
index 7ed6bd9..7d348e6 100644
--- a/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
+++ b/src/main/java/com/supervision/police/dto/ModelCaseDTO.java
@@ -60,7 +60,13 @@ public class ModelCaseDTO {
      * 冗余字段，方便前端取数，后端勿用
      */
     @Schema(description = "行为人姓名")
-    private String lawActorName;
+    private String caseActorName;
+
+    /**
+     * 冗余字段，方便前端取数，后端勿用
+     */
+    @Schema(description = "行为人身份证号")
+    private String caseActorIdCard;
 
     @Schema(description = "案件行为人")
     private CasePerson lawActor;
@@ -110,8 +116,9 @@ public class ModelCaseDTO {
 
     public void floatLawActorInfo() {
         if (Objects.nonNull(lawActor)){
-            this.lawActorName = lawActor.getName();
+            this.caseActorName = lawActor.getName();
             this.lawActorId = lawActor.getId();
+            this.caseActorIdCard = lawActor.getIdCard();
         }
     }
 
diff --git a/src/main/java/com/supervision/police/dto/NoteRecordDTO.java b/src/main/java/com/supervision/police/dto/NoteRecordDTO.java
index bf661d5..26f6d9b 100644
--- a/src/main/java/com/supervision/police/dto/NoteRecordDTO.java
+++ b/src/main/java/com/supervision/police/dto/NoteRecordDTO.java
@@ -2,6 +2,7 @@ package com.supervision.police.dto;
 
 import cn.hutool.core.collection.CollUtil;
 import com.supervision.police.domain.NoteRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -26,6 +27,10 @@ public class NoteRecordDTO {
      */
     private List<String> fileIdList;
 
+
+    @Schema(description = "笔录人员id")
+    private String personId;
+
     /**
      * 姓名
      */
@@ -70,6 +75,7 @@ public class NoteRecordDTO {
         noteRecord.setLawAsker(lawAsker);
         noteRecord.setConfessionStartTime(confessionStartTime);
         noteRecord.setConfessionEndTime(confessionEndTime);
+        noteRecord.setCasePersonId(personId);
         return noteRecord;
     }
 
diff --git a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java
index 7465fba..6bd349f 100644
--- a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java
+++ b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java
@@ -29,6 +29,11 @@ public class NoteRecordDetailDTO {
      */
     private List<NoteRecordFileDTO> fileList = new ArrayList<>();
 
+    /**
+     * 笔录人员id
+     */
+    private String personId;
+
     /**
      * 姓名
      */
@@ -82,6 +87,7 @@ public class NoteRecordDetailDTO {
         this.id = noteRecord.getId();
         this.caseId = noteRecord.getCaseId();
         this.recordName = noteRecord.getRecordName();
+        this.personId = noteRecord.getCasePersonId();
         this.name = noteRecord.getName();
         this.role = noteRecord.getRole();
         this.confessionMaterial = noteRecord.getConfessionMaterial();
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 d91e0b3..ac32151 100644
--- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java
@@ -103,8 +103,12 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
             modelCaseDTO.setIdentifyResultName(comDictionaryService.getName(dicts, "identify_result", modelCaseDTO.getIdentifyResult()));
             Map<String, List<CasePerson>> casePersonMap = persionMap.get(modelCaseDTO.getId());
             if (CollUtil.isNotEmpty(casePersonMap)) {
-                modelCaseDTO.setLawActor(CollUtil.getFirst(casePersonMap.get("1")));
-                modelCaseDTO.floatLawActorInfo();
+                Optional<CasePerson> optionalCasePerson = casePersonMap.getOrDefault("1", new ArrayList<>())
+                        .stream().filter(person -> Integer.valueOf(1).equals(person.getCaseActorFlag())).findAny();
+                if (optionalCasePerson.isPresent()){
+                    modelCaseDTO.setLawActor(optionalCasePerson.get());
+                    modelCaseDTO.floatLawActorInfo();
+                }
                 modelCaseDTO.setLawPartyList(casePersonMap.getOrDefault("2", new ArrayList<>()));
             }
             if (Objects.isNull(modelCaseDTO.getLawPartyList())) {
diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
index 44aae43..50b05c8 100644
--- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
@@ -81,25 +81,6 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
     public String uploadRecords(NoteRecordDTO records) throws IOException {
-        //修改案件的行为人、当事人
-        /*if (StringUtils.isNotEmpty(records.getRole()) && !"嫌疑人".equals(records.getRole())) {
-            ModelCase modelCase = modelCaseMapper.selectById(records.getCaseId());
-            //行为人
-            if ("行为人".equals(records.getRole()) && StringUtils.isEmpty(modelCase.getLawActor())) {
-                modelCase.setLawActor(records.getName());
-                modelCaseMapper.updateById(modelCase);
-            } else if ("受害人".equals(records.getRole()) || "证人".equals(records.getRole())) {
-                if (StringUtils.isEmpty(modelCase.getLawParty())) {
-                    modelCase.setLawParty(records.getName());
-                } else {
-                    String[] split = modelCase.getLawParty().split(",");
-                    if (!Arrays.asList(split).contains(records.getName())) {
-                        modelCase.setLawParty(modelCase.getLawParty() + "," + records.getName());
-                    }
-                }
-                modelCaseMapper.updateById(modelCase);
-            }
-        }*/
         int i;
         ModelCase modelCase = modelCaseService.getById(records.getCaseId());
         if (StringUtils.isEmpty(modelCase.getCaseNo())){