From 6e164fc0529e4334d5d2d25e86dff797e7bb92b9 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Tue, 5 Nov 2024 14:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EntrustAlterApplyServiceImpl.java        | 8 ++++----
 .../EntrustmentIdentificationMaterialServiceImpl.java     | 6 ++++--
 .../entrustment/service/impl/EntrustmentServiceImpl.java  | 2 +-
 3 files changed, 9 insertions(+), 7 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 0d92ce9..c826646 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
@@ -207,8 +207,8 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         String entrustmentId = entrustment.getId();
         CaseEvent oldCaseInfo = caseEventService.getById(entrustment.getCaseId());
         caseEventService.update(Wrappers.<CaseEvent>lambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()).set(CaseEvent::getCaseBrief, dto.getCaseBrief()));
-        // 添加更新记录
-        updateRecordBuilder.append("操作记录：\\n").append("该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。");
+        // 添加更新记录  | - 代表换行
+        updateRecordBuilder.append("操作记录：").append("-该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。");
         // 2.修改检材 信息
         // 这里之所以要取未更新前的信息是为了留痕
         Map<String, EntrustmentIdentificationMaterial> oldInfoMap = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>lambdaQuery()
@@ -236,10 +236,10 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
                 continue;
             }
             if (index == 1) {
-                updateRecordBuilder.append("检材信息的更新记录：");
+                updateRecordBuilder.append("-检材信息的更新记录：");
             }
             updateRecordBuilder
-                    .append("\\n")
+                    .append("-")
                     .append(index++)
                     .append(".原检材编号为 [")
                     .append(oldMaterial.getImNo())
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
index 4d33556..15c0974 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
@@ -1397,9 +1397,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                 //这里判断委托单位是否分样
                 //identificationMaterial.setSample1No(sampleService.getNewSampleNo(identificationMaterial.getImNo(),1));
                 // 初始化委托序号
-                identificationMaterial.setImEntrustNumber(currentEntrustMaterialCount.toString());
                 currentEntrustMaterialCount++;
-
+                if (StrUtil.isBlank(identificationMaterial.getImEntrustNumber())) {
+                    // 如果为空则设置默认值
+                    identificationMaterial.setImEntrustNumber(currentEntrustMaterialCount.toString());
+                }
                 identificationMaterial.setCreateBy(dlpUser.getId());
                 identificationMaterial.setCreateTime(LocalDateTime.now());
                 identificationMaterial.setAcceptNo(null);
diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index 65080dd..d80948a 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -3189,7 +3189,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         Integer entrustAlterApplyCount = (int) entrustAlterApplyService.count(Wrappers.<EntrustAlterApply>lambdaQuery()
                 .eq(EntrustAlterApply::getStatus, EntrustAlterApplyStatus.APPLY_SUCCESS.getStatus())
                 .eq(EntrustAlterApply::getApplyOrgId, orgId));
-        markersVOS.add(new MarkersVO("委托申请修改", entrustAlterApplyCount, "申请通过"));
+        markersVOS.add(new MarkersVO("案件委托", entrustAlterApplyCount, "委托申请修改"));
 
         try {
             R<Integer> data1 = remoteHairJobService.getJobQuantity(orgId, 0);