feat: 结算报告审批-查看的任务状态/报告审核状态的筛选条件2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/ReportTaskListPageDTO.java

@@ -32,7 +32,7 @@ public class ReportTaskListPageDTO implements Serializable {
     /**
      * 报告审核状态: 0-未审核,1-通过,2-不通过
      */
-    private String approvalOpinion;
+    private String reportApprovalOpinion;
 
     /**
      * 任务状态

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

@@ -966,7 +966,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 	@Override
 	public R getTaskListPage(Page page, ReportTaskListPageDTO reportTaskListPageDTO) {
 		Integer isApprovalPage = reportTaskListPageDTO.getIsApprovalPage();
-		String approvalOpinion = reportTaskListPageDTO.getApprovalOpinion();
+		String reportApprovalOpinion = reportTaskListPageDTO.getReportApprovalOpinion();
 		String taskStatus = reportTaskListPageDTO.getTaskStatus();
 		String taskNumber = reportTaskListPageDTO.getTaskNumber();
 		String taskTypeId = reportTaskListPageDTO.getTaskTypeId();
@@ -989,7 +989,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			}
 		} else {
 			// 查看页面, 审核状态筛选条件
-			if (StrUtil.equals("0", approvalOpinion)) {
+			if (StrUtil.equals("0", reportApprovalOpinion)) {
 				// 未审核的条件
 				if ("0".equals(scorePackage.getTypeid())) {//药企
 					lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
@@ -998,14 +998,14 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				} else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
 					lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
 				}
-			} else if (StrUtil.equalsAny(approvalOpinion, "1", "2")) {
+			} else if (StrUtil.equalsAny(reportApprovalOpinion, "1", "2")) {
 				// 审核通过/不通过的条件
 				if ("0".equals(scorePackage.getTypeid())) {//药企
-					lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, approvalOpinion);
+					lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, reportApprovalOpinion);
 				} else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
-					lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, approvalOpinion);
+					lambdaQueryWrapper.eq(WmTask::getReportDrugApprovalOpinion, reportApprovalOpinion);
 				} else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
-					lambdaQueryWrapper.eq(WmTask::getReportOneApprovalOpinion, approvalOpinion);
+					lambdaQueryWrapper.eq(WmTask::getReportOneApprovalOpinion, reportApprovalOpinion);
 				}
 			}
 		}