From f98d4fc84b56d366eb8fe93bb5ae64cb0011f903 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Tue, 19 Nov 2024 16:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=81=9A=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=99=E4=B8=8D=E6=B7=BB=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EntrustAlterApplyServiceImpl.java    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
index b7529a3..452efbe 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
@@ -210,9 +210,10 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         CaseEvent oldCaseInfo = caseEventService.getById(entrustment.getCaseId());
         caseEventService.update(Wrappers.<CaseEvent>lambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()).set(CaseEvent::getCaseBrief, dto.getCaseBrief()));
         // 添加更新记录  | <br> 代表换行
-        updateRecordBuilder.append(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        LocalDateTime opDate = null; // 操作的时间，这里也用来标识是否有更新
         if (!oldCaseInfo.equals(dto.getCaseBrief())) {
-            updateRecordBuilder.append("<br>案件更新记录：").append("<br>该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。");
+            opDate = LocalDateTime.now();
+            updateRecordBuilder.append(opDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).append("<br>案件更新记录：").append("<br>该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。");
         }
         // 2.修改检材 信息
         // 这里之所以要取未更新前的信息是为了留痕
@@ -224,11 +225,12 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterialList = processUpdateEntrustMaterialInfo(
                 dto.getMaterialList(),
                 oldInfoMap,
-                updateRecordBuilder
+                updateRecordBuilder,
+                opDate
         );
         entrustmentIdentificationMaterialService.updateBatchById(entrustmentIdentificationMaterialList);
         // 3. 更新委托鉴定要求
-        updateEntrustmentRequirement(entrustment, dto.getEntrustRequirement(), updateRecordBuilder);
+        updateEntrustmentRequirement(entrustment, dto.getEntrustRequirement(), updateRecordBuilder, opDate);
         // 如果确认完成，则删除鉴定事项确认书和委托书，并更新申请状态为已完成
         if (dto.getFinished()) {
             // 4.删除鉴定事项确认书和委托书
@@ -242,12 +244,13 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
     /**
      * 处理更新委托鉴定检材信息
      *
-     * @param materialList 待更新的材料DTO列表
-     * @param oldInfoMap   旧的委托鉴定材料信息映射表，key为材料ID，value为对应的委托鉴定材料对象
+     * @param materialList        待更新的材料DTO列表
+     * @param oldInfoMap          旧的委托鉴定材料信息映射表，key为材料ID，value为对应的委托鉴定材料对象
      * @param updateRecordBuilder 更新记录构建器，用于构建更新记录
+     * @param opDate
      * @return 更新后的委托鉴定材料对象列表
      */
-    private List<EntrustmentIdentificationMaterial> processUpdateEntrustMaterialInfo(List<MaterialDTO> materialList, Map<String, EntrustmentIdentificationMaterial> oldInfoMap, StringBuilder updateRecordBuilder) {
+    private List<EntrustmentIdentificationMaterial> processUpdateEntrustMaterialInfo(List<MaterialDTO> materialList, Map<String, EntrustmentIdentificationMaterial> oldInfoMap, StringBuilder updateRecordBuilder, LocalDateTime opDate) {
         Integer index = 1;
         List<EntrustmentIdentificationMaterial> entrustmentIdentificationMaterialList = new ArrayList<>();
         for (MaterialDTO item : materialList) {
@@ -267,7 +270,13 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
                 // 信息并没有修改，不操作
                 continue;
             }
+
             if (index == 1) {
+                if (opDate == null) {
+                    // 等于null 证明案件简要并没有修改
+                    opDate = LocalDateTime.now();
+                    updateRecordBuilder.append(opDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                }
                 updateRecordBuilder.append("<br>检材信息的更新记录：");
             }
             updateRecordBuilder
@@ -331,10 +340,16 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
      * @param entrustment
      * @param entrustRequirement
      * @param updateRecordBuilder
+     * @param opDate
      */
-    public void updateEntrustmentRequirement(Entrustment entrustment, String entrustRequirement, StringBuilder updateRecordBuilder) {
+    public void updateEntrustmentRequirement(Entrustment entrustment, String entrustRequirement, StringBuilder updateRecordBuilder, LocalDateTime opDate) {
         if (StrUtil.isNotBlank(entrustRequirement) && !entrustment.getEntrustRequirement().equals(entrustRequirement)) {
             entrustment.setEntrustRequirement(entrustRequirement);
+            if (opDate == null) {
+                // 等于null 证明前面的信息并没有修改
+                opDate = LocalDateTime.now();
+                updateRecordBuilder.append(opDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }
             updateRecordBuilder.append("<br>鉴定要求更新记录：").append("<br>原鉴定要求 [").append(entrustment.getEntrustRequirement()).append("] 修改为  [").append(entrustRequirement).append("]。");
         } else {
             List<EntrustmentIdentificationMaterial> renewList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()