Browse Source

feat: 中止积分包值计算逻辑v2.3.3

shc 3 years ago
parent
commit
dfbc379138

+ 10 - 7
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -973,15 +973,18 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 								if (passed == 0){
 									wmScorePackage.setScorePackageStatus("6");//已终止
 									wmScorePackage.setEnableFlag("1");
-									taskList1.forEach(task -> {task.setEnableFlag("1");
-										if(StringUtils.equalsAny(task.getReportOneApprovalStatus(),"0","1")){
-											task.setTaskStatus("4");
-										}
-										task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
-										task.setReportDrugApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
-									wmTaskMapper.updateById(task);});
 									all = true;
 								}
+
+								taskList1.forEach(task -> {task.setEnableFlag("1");
+									if(StringUtils.equalsAny(task.getReportOneApprovalStatus(),"0","1")){
+										task.setTaskStatus("4");
+									}
+									task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
+									task.setReportDrugApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
+									wmTaskMapper.updateById(task);
+								});
+
 								res = sum = passed;
 								if (res > 0) {//个人积分包值大于任务积分值
 									wmScorePackageStatus.setUserScore(sum + "");