|
|
|
@ -758,12 +758,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru |
|
|
|
|
.stream() |
|
|
|
|
.collect( |
|
|
|
|
Collectors.groupingBy(item -> |
|
|
|
|
item.getAnalysisOption() + |
|
|
|
|
"_" + |
|
|
|
|
DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs()) |
|
|
|
|
.stream() |
|
|
|
|
.map(DrugLite::getName) |
|
|
|
|
.collect(Collectors.joining("")), |
|
|
|
|
item.getAnalysisOption() + |
|
|
|
|
"_" + |
|
|
|
|
DrugLiteConvert.convertDirtyLiteByJSON(item.getCandidateDrugs()) |
|
|
|
|
.stream() |
|
|
|
|
.map(DrugLite::getName) |
|
|
|
|
.collect(Collectors.joining("")), |
|
|
|
|
LinkedHashMap::new, // 返回有序map
|
|
|
|
|
Collectors.toList()) |
|
|
|
|
); |
|
|
|
@ -1625,8 +1625,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru |
|
|
|
|
if (!this.update(null, updateWrapper)) { |
|
|
|
|
throw new RuntimeException("保存委托信息失败"); |
|
|
|
|
} |
|
|
|
|
this.bizApprover_Claim(entrust, dlpUser); |
|
|
|
|
this.bizApprover_Apply(entrust, 1, dlpUser); |
|
|
|
|
if (opCode == 1) { |
|
|
|
|
this.bizApprover_Claim(entrust, dlpUser); |
|
|
|
|
this.bizApprover_Apply(entrust, 1, dlpUser); |
|
|
|
|
} |
|
|
|
|
// 从数据库表中取出保存的委托对象, 后续的操作我们以此为准
|
|
|
|
|
entrustment = this.getById(entrust.getId()); |
|
|
|
|
if (entrustment == null) { |
|
|
|
|