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

20250715 更新

Browse Source
This commit is contained in:
陈江保
2025-07-15 14:04:41 +08:00
parent 96fd1f01ca
commit fe5d8690df
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java
View File

@@ -39,7 +39,7 @@ public class ApprovedUpdateEntrustDTO {
private List<MaterialDTO> materialList;
@ApiModelProperty("嫌疑人信息")
private List<Suspect> suspectList;
private List<Suspect> suspects;
@ApiModelProperty(value = "案发时间")
private LocalDateTime happenTime;

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

@@ -252,9 +252,9 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
updateRecordBuilder.append("<br>该委托案件的委托类型由 [").append(entrustVO.getEntrustmentType() == 0 ? "常规毒品" : "生物样本").append("] 更改为 [").append(dto.getEntrustmentType() == 0 ? "常规毒品" : "生物样本").append("] 。");
}
// 更新嫌疑人信息
if (CollUtil.isNotEmpty(dto.getSuspectList())) {
processUpdateSuspectInfo(dto.getSuspectList(), entrustVO.getSuspects(), updateRecordBuilder, opDate);
suspectService.addSuspectList(dto.getSuspectList(), entrustVO.getId());
if (CollUtil.isNotEmpty(dto.getSuspects())) {
processUpdateSuspectInfo(dto.getSuspects(), entrustVO.getSuspects(), updateRecordBuilder, opDate);
suspectService.addSuspectList(dto.getSuspects(), entrustVO.getId());
// 删除旧的嫌疑人信息
if (CollUtil.isNotEmpty(entrustVO.getSuspects())) {
suspectService.removeBatchByIds(entrustVO.getSuspects().stream().map(Suspect::getId).collect(Collectors.toList()));
@@ -299,18 +299,19 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
// 转map，便于后续操作
Map<String, Suspect> oldSuspectMap = oldSuspectList.stream().collect(Collectors.toMap(Suspect::getId, Function.identity()));
for (Suspect suspect : newSuspectList) {
if (StrUtil.isBlank(suspect.getId()) || !oldSuspectMap.containsKey(suspect.getId())) {
String phoneNumber = suspect.getPhoneNumber() == null ? "" : suspect.getPhoneNumber();
if (StrUtil.isBlank(suspect.getId())) {
// 新增嫌疑人
opDate = initUpdateRecordInfo(opDate, updateRecordBuilder, 2);
updateRecordBuilder.append("<br>新增嫌疑人：姓名[").append(suspect.getName())
.append("]，身份证号[").append(suspect.getIdNumber())
.append("]，联系电话[").append(suspect.getPhoneNumber()).append("]");
.append("]，联系电话[").append(phoneNumber).append("]");
} else {
// 更新嫌疑人信息
Suspect oldSuspect = oldSuspectMap.get(suspect.getId());
boolean changeName = !Objects.equals(oldSuspect.getName(), suspect.getName());
boolean changeIdNumber = !Objects.equals(oldSuspect.getIdNumber(), suspect.getIdNumber());
boolean changePhone = !Objects.equals(oldSuspect.getPhoneNumber(), suspect.getPhoneNumber());
boolean changePhone = !Objects.equals(oldSuspect.getPhoneNumber(), phoneNumber);
if (changeName || changeIdNumber || changePhone) {
opDate = initUpdateRecordInfo(opDate, updateRecordBuilder, 2);
updateRecordBuilder.append("<br>原嫌疑人信息：姓名[").append(oldSuspect.getName())
@@ -320,7 +321,7 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
.append(suspect.getName()).append("]，身份证号[")
.append(suspect.getIdNumber())
.append("]，联系电话[")
.append(suspect.getPhoneNumber()).append("]");
.append(phoneNumber).append("]");
}
}
}