Browse Source

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

shc 3 years ago
parent
commit
b3bdde249d

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

@@ -975,7 +975,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 									wmScorePackage.setEnableFlag("1");
 									taskList1.forEach(task -> {task.setEnableFlag("1");
 										task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
-										task.setReportDrugApprovalInfo(ReportEnum.APPROVAL_OPINION_NO.getType());
+										task.setReportDrugApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
 									wmTaskMapper.updateById(task);});
 									all = true;
 								}

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -1094,7 +1094,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 				}
 			}
 			List<String> ids2 = taskList.stream()
-					.filter(task -> "0".equals(task.getReportOneApprovalStatus()))
+					.filter(task -> "0".equals(task.getReportOneApprovalStatus()) && "1".equals(task.getReportDrugApprovalOpinion()))
 					.map(p -> p.getId())
 					.collect(Collectors.toList());