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

更新

Browse Source
This commit is contained in:
陈江保
2024-11-05 14:06:48 +08:00
parent a8078ef106
commit 6e164fc052
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

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

2
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

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