Просмотр исходного кода

Merge branch 'feature-platformaudittask-210901' into master

Qutong 3 лет назад
Родитель
Сommit
909a38d5a7

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

@@ -251,7 +251,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			wmTask.setReportSecondApprovalStatus(ReportEnum.REPORT_STATUS_APPROVAL.getType());
 		}
 //
-		if ("2".equals(approvalOpinion)) {
+		if ("1".equals(approvalOpinion)) {
+			updateTaskWrapper.set(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val());
+		} else if ("2".equals(approvalOpinion)) {
 			// 审核不通过,则设置TaskStatus为不通过
 			updateTaskWrapper.set(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val());
 		}