|
|
@@ -720,8 +720,8 @@ public class WmPackageManager {
|
|
|
|
|
|
// 监督扣减分值：取上方所选的执行包下，所有监督流程走完的任务，在第一个监督员角色（四个角色）下监督意见为“监督不通过”的任务分值总和
|
|
|
// 开发理解的取值逻辑：取监督结果为不通过，监察状态为CKT2（待人用疫苗事业部总经理审核），且不可修改的数据对应的任务分值总和，即为监督扣减分值
|
|
|
- List<WmTaskSupervision> taskSupervisions =
|
|
|
- taskSupervisionMapper.selectList(Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
+ List<WmTaskSupervision> taskSupervisions = CollUtil.isEmpty(pkgIds) ? Collections.emptyList()
|
|
|
+ : taskSupervisionMapper.selectList(Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
.in(WmTaskSupervision::getPackageId, pkgIds).eq(WmTaskSupervision::getSupervisionResult, Boolean.FALSE)
|
|
|
.eq(WmTaskSupervision::getModifiable, Boolean.FALSE).in(WmTaskSupervision::getSupervisionState,
|
|
|
UpmsState.TaskSupervisionState.CKT2, UpmsState.TaskSupervisionState.PASSED));
|
|
|
@@ -745,7 +745,7 @@ public class WmPackageManager {
|
|
|
// 二阶段兑付分值
|
|
|
double step2SupDeductScore = CollUtil.isNotEmpty(notices)
|
|
|
? notices.stream()
|
|
|
- .filter(rdm -> rdm.getStep().equals(1) && !CheckState.REJECTED.getState().equals(rdm.getCheckState()))
|
|
|
+ .filter(rdm -> rdm.getStep().equals(2) && !CheckState.REJECTED.getState().equals(rdm.getCheckState()))
|
|
|
.mapToDouble(WmPackageRedemptionNotice::getCurrentRedemptionScore)
|
|
|
.sum()
|
|
|
: 0;
|
