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-12 16:08:08 +08:00
parent a4ac1fd5f9
commit 0a8e2089cd
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+10 -8
View File
@@ -758,12 +758,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
.stream() .stream()
.collect( .collect(
Collectors.groupingBy(item -> Collectors.groupingBy(item ->
item.getAnalysisOption() + item.getAnalysisOption() +
"_" + "_" +
DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs()) DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs())
.stream() .stream()
.map(DrugLite::getName) .map(DrugLite::getName)
.collect(Collectors.joining("")), .collect(Collectors.joining("")),
LinkedHashMap::new, // 返回有序map LinkedHashMap::new, // 返回有序map
Collectors.toList()) Collectors.toList())
); );
@@ -1625,8 +1625,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
if (!this.update(null, updateWrapper)) { if (!this.update(null, updateWrapper)) {
throw new RuntimeException("保存委托信息失败"); throw new RuntimeException("保存委托信息失败");
} }
this.bizApprover_Claim(entrust, dlpUser); if (opCode == 1) {
this.bizApprover_Apply(entrust, 1, dlpUser); this.bizApprover_Claim(entrust, dlpUser);
this.bizApprover_Apply(entrust, 1, dlpUser);
}
// 从数据库表中取出保存的委托对象, 后续的操作我们以此为准 // 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
entrustment = this.getById(entrust.getId()); entrustment = this.getById(entrust.getId());
if (entrustment == null) { if (entrustment == null) {