|
@@ -898,7 +898,16 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
WmScorePackage updateScorePackage = new WmScorePackage();
|
|
WmScorePackage updateScorePackage = new WmScorePackage();
|
|
updateScorePackage.setId(task.getScorePackageId());
|
|
updateScorePackage.setId(task.getScorePackageId());
|
|
if (totalTaskScore >= taskScorePackage.getScore()) {
|
|
if (totalTaskScore >= taskScorePackage.getScore()) {
|
|
- updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val());
|
|
|
|
|
|
+ // 上级审核通过的积分值
|
|
|
|
+ int superApprovedScore = submitedTaskList.stream()
|
|
|
|
+ .filter(t -> TaskStatusEnum.APPROVED.val().equals(t.getTaskStatus()) &&
|
|
|
|
+ ("1".equals(t.getReportDrugApprovalOpinion()) || "1".equals(t.getReportOneApprovalOpinion())))
|
|
|
|
+ .mapToInt(WmTask::getScore).sum();
|
|
|
|
+ if (superApprovedScore >= taskScorePackage.getScore()) {
|
|
|
|
+ updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
|
|
|
|
+ } else {
|
|
|
|
+ updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_APPROVAL.val());
|
|
|
|
+ }
|
|
updateScorePackage.setTaskAddFlag("0");
|
|
updateScorePackage.setTaskAddFlag("0");
|
|
updateScorePackageStatus.setTaskAddFlag("0");
|
|
updateScorePackageStatus.setTaskAddFlag("0");
|
|
}else {
|
|
}else {
|