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 ServiceImpllambdaUpdate().eq(CaseEvent::getId, entrustment.getCaseId()).set(CaseEvent::getCaseBrief, dto.getCaseBrief())); // 添加更新记录 |
代表换行 - updateRecordBuilder.append(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + LocalDateTime opDate = null; // 操作的时间,这里也用来标识是否有更新 if (!oldCaseInfo.equals(dto.getCaseBrief())) { - updateRecordBuilder.append("
案件更新记录:").append("
该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。"); + opDate = LocalDateTime.now(); + updateRecordBuilder.append(opDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).append("
案件更新记录:").append("
该委托案件的案件简要由 [").append(oldCaseInfo.getCaseBrief()).append("] 更改为 [").append(dto.getCaseBrief()).append("] 。"); } // 2.修改检材 信息 // 这里之所以要取未更新前的信息是为了留痕 @@ -224,11 +225,12 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl 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 processUpdateEntrustMaterialInfo(List materialList, Map oldInfoMap, StringBuilder updateRecordBuilder) { + private List processUpdateEntrustMaterialInfo(List materialList, Map oldInfoMap, StringBuilder updateRecordBuilder, LocalDateTime opDate) { Integer index = 1; List entrustmentIdentificationMaterialList = new ArrayList<>(); for (MaterialDTO item : materialList) { @@ -267,7 +270,13 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl检材信息的更新记录:"); } updateRecordBuilder @@ -331,10 +340,16 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl鉴定要求更新记录:").append("
原鉴定要求 [").append(entrustment.getEntrustRequirement()).append("] 修改为 [").append(entrustRequirement).append("]。"); } else { List renewList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery()