|
@@ -480,7 +480,9 @@ public class ReportExportServiceImpl implements ReportExportService {
|
|
|
List<WmTask> taskList = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, idSet)
|
|
|
.eq(WmTask::getTaskStatus, 3)
|
|
|
.and(item -> item.in(WmTask::getReportDrugApprovalStatus, Arrays.asList(5, 6)).eq(WmTask::getReportDrugApprovalOpinion, 1)
|
|
|
- .or(item2 -> item2.in(WmTask::getReportOneApprovalStatus, Arrays.asList(5, 6)).eq(WmTask::getReportOneApprovalOpinion, 1))));
|
|
|
+ .or(item2 -> item2.in(WmTask::getReportOneApprovalStatus, Arrays.asList(5, 6)).eq(WmTask::getReportOneApprovalOpinion, 1))
|
|
|
+ .or(item3 -> item3.in(WmTask::getReportSecondApprovalStatus, Arrays.asList(5, 6)).eq(WmTask::getReportSecondApprovalOpinion, 1))
|
|
|
+ ));
|
|
|
|
|
|
if (CollUtil.isEmpty(taskList)) {
|
|
|
return R.failed("ERROR_未查询到该报告关联的审批通过的任务");
|