From 2983ef78af44d97ca6b0465ad775246619fa3e0c Mon Sep 17 00:00:00 2001 From: "weicw1996@qq.com" Date: Fri, 2 Oct 2026 19:58:06 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=AE=A4=E8=AF=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 审核页要按「待审核 / 已通过 / 已驳回」分页签展示，而原接口把状态写死成 审核中（status=0），已通过/已驳回的记录根本查不出来。 新增可选的 status 参数；不传时仍按审核中处理，保持原有调用方行为不变。 --- .../controller/CertificationAuditController.java | 6 ++++-- .../transport/service/ICertAuditService.java | 14 +++++++++----- .../service/impl/CertAuditServiceImpl.java | 7 +++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java index 3d7990c1..5cbd368a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java @@ -63,15 +63,17 @@ public class CertificationAuditController extends BladeController { @GetMapping("/pending-page") @ApiOperationSupport(order = 1) - @Operation(summary = "待审列表", description = "按认证对象类型分页查询审核中的记录，按提交时间倒序") + @Operation(summary = "认证记录列表", description = "按认证对象类型与审核状态分页查询，按提交时间倒序；状态不传时查审核中的记录") @PreAuth(CertAuditPermissions.AUDIT_VIEW) public R> pendingPage( @Parameter(description = "认证对象类型：driver-司机，vehicle-车辆", required = true) @RequestParam String bizType, @Parameter(description = "展示键模糊匹配：司机姓名 / 车牌号") @RequestParam(required = false) String bizKey, + @Parameter(description = "审核状态：0审核中 1已通过 2已驳回 3已作废；不传按0（审核中）处理") + @RequestParam(required = false) Integer status, Query query) { - return R.data(certAuditService.pendingPage(bizType, bizKey, Condition.getPage(query))); + return R.data(certAuditService.pendingPage(bizType, bizKey, status, Condition.getPage(query))); } @GetMapping("/detail") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java index 4efaa9f8..69274414 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java @@ -41,14 +41,18 @@ import org.springblade.transport.pojo.vo.TransportCertRecordVO; public interface ICertAuditService { /** - * 待审记录分页（按认证对象类型） + * 认证记录分页（按认证对象类型与审核状态） + *

+ * 审核页按「待审核 / 已通过 / 已驳回」分页签展示，故状态可传； + * 不传时按待审核处理，兼容只想要待审队列的调用方。 * * @param bizType 认证对象类型：driver-司机，vehicle-车辆 - * @param bizKey 展示键模糊匹配，可为空 - * @param page 分页参数（由 Controller 用 Condition.getPage 构造） - * @return 待审记录分页 + * @param bizKey 展示键模糊匹配，可为空 + * @param status 审核状态：0审核中 1已通过 2已驳回 3已作废；为空时取 0（审核中） + * @param page 分页参数（由 Controller 用 Condition.getPage 构造） + * @return 认证记录分页 */ - IPage pendingPage(String bizType, String bizKey, + IPage pendingPage(String bizType, String bizKey, Integer status, IPage page); /** diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java index 2d088094..a7a3a526 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java @@ -70,14 +70,17 @@ public class CertAuditServiceImpl implements ICertAuditService { private final IDriverService driverService; @Override - public IPage pendingPage(String bizType, String bizKey, + public IPage pendingPage(String bizType, String bizKey, Integer status, IPage page) { if (!CertificationRuleSupport.isValidBizType(bizType)) { throw new ServiceException("认证对象类型不正确"); } + // 未传状态时按「审核中」处理：审核页默认停在待审页签， + // 只关心待审队列的调用方也不必额外传参 + Integer queryStatus = status == null ? TransportCertRecord.STATUS_PENDING : status; LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery() .eq(TransportCertRecord::getBizType, bizType) - .eq(TransportCertRecord::getStatus, TransportCertRecord.STATUS_PENDING) + .eq(TransportCertRecord::getStatus, queryStatus) .like(Func.isNotEmpty(bizKey), TransportCertRecord::getBizKey, bizKey) .orderByDesc(TransportCertRecord::getSubmitTime); return TransportCertRecordWrapper.build().pageVO(certRecordService.page(page, queryWrapper));