Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source 
1.判断如果没有做任何修改则不添加修改记录
This commit is contained in:
陈江保
2024-11-19 16:31:36 +08:00
parent 93263a97bd
commit f98d4fc84b
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java
View File

@@ -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()