Merge remote-tracking branch 'websoft/dev'

# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
2026-10-12 10:39:38 +08:00
parent a2e9e020b1 4fe0c8a968
commit 42ca5ee7bc
20 changed files with 1441 additions and 132 deletions
@@ -44,4 +44,7 @@ public class AdminHomeBadgesVO implements Serializable {
 	@Schema(description = "风险记录待办数（disposalStatus=pending）")
 	private long risk;

+	@Schema(description = "重新派单待办数（司机已拒单且运单未取消未完成）")
+	private long pendingReassign;
+
 }
@@ -49,7 +49,7 @@ public class AdminHomeVO implements Serializable {
 	@Schema(description = "快捷入口角标")
 	private AdminHomeBadgesVO badges = new AdminHomeBadgesVO();

-	@Schema(description = "待处理事项（异常处置状态≠已完成）")
+	@Schema(description = "待处理事项（异常处置状态≠已完成，或司机已拒单待重新派单）")
 	private List<AdminTodoItemVO> feed = new ArrayList<>();

 }
@@ -70,6 +70,12 @@ public class CertAuditDetailVO implements Serializable {
 	private Long submitUser;
 	@Schema(description = "本次提交人姓名")
 	private String submitUserName;
+	@Schema(description = "本次审核人；未审核时为 null")
+	private Long auditUser;
+	@Schema(description = "本次审核人姓名；未审核时为空")
+	private String auditUserName;
+	@Schema(description = "审核时间（通过或驳回的时间）；未审核时为 null")
+	private LocalDateTime auditTime;

 	@Schema(description = "待审快照：本次提交的全量内容")
 	private String pendingSnapshotJson;
@@ -49,4 +49,7 @@ public class DriverNodePunchVO implements Serializable {
 	@Schema(description = "数量")
 	private String quantity;

+	@Schema(description = "本次打卡是否使运单自动完成")
+	private Boolean waybillCompleted;
+
 }