From 5882ba8863d77fdcc168b176c3ffb30e8a20556a Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 13 七月 2026 17:54:25 +0800
Subject: [PATCH] 缩短二维码原始参数
---
backend/src/main/java/com/sinata/appointment/controller/MiniApprovalController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/backend/src/main/java/com/sinata/appointment/controller/MiniApprovalController.java b/backend/src/main/java/com/sinata/appointment/controller/MiniApprovalController.java
index b274706..7a51eda 100644
--- a/backend/src/main/java/com/sinata/appointment/controller/MiniApprovalController.java
+++ b/backend/src/main/java/com/sinata/appointment/controller/MiniApprovalController.java
@@ -4,10 +4,12 @@
import com.sinata.appointment.common.ResultUtil;
import com.sinata.appointment.dto.ApprovalFlowNodeVo;
import com.sinata.appointment.dto.MiniApprovalActionRequest;
+import com.sinata.appointment.dto.MiniApprovalAllVo;
import com.sinata.appointment.dto.MiniApprovalDetailVo;
import com.sinata.appointment.dto.MiniApprovalTodoVo;
import com.sinata.appointment.dto.MiniHandlerApprovalActionRequest;
import com.sinata.appointment.dto.MiniHandlerApprovalTodoVo;
+import com.sinata.appointment.service.MiniApprovalAggregateApplicationService;
import com.sinata.appointment.service.ApprovalFlowViewApplicationService;
import com.sinata.appointment.service.MiniApprovalDetailApplicationService;
import com.sinata.appointment.service.MiniHandlerApprovalApplicationService;
@@ -33,6 +35,7 @@
public class MiniApprovalController {
private final MiniHandlerApprovalApplicationService miniHandlerApprovalApplicationService;
+ private final MiniApprovalAggregateApplicationService miniApprovalAggregateApplicationService;
private final MiniApprovalDetailApplicationService miniApprovalDetailApplicationService;
private final ApprovalFlowViewApplicationService approvalFlowViewApplicationService;
@@ -41,11 +44,31 @@
public Result<List<MiniApprovalTodoVo>> myTodo(
@RequestParam(defaultValue = "1") long page,
@RequestParam(defaultValue = "10") long size,
+ @RequestParam(required = false) String visitorNameKeyword,
@RequestParam(required = false) String visitedUserNameKeyword,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate visitDate) {
+ String keyword = visitorNameKeyword != null && !visitorNameKeyword.isBlank()
+ ? visitorNameKeyword
+ : visitedUserNameKeyword;
return ResultUtil.page(
miniHandlerApprovalApplicationService.pageMyTodoAll(
- page, size, visitedUserNameKeyword, visitDate));
+ page, size, keyword, visitDate));
+ }
+
+ @Operation(summary = "小程序审批统一列表（待办+历史）")
+ @GetMapping("/all")
+ public Result<List<MiniApprovalAllVo>> myAll(
+ @RequestParam(defaultValue = "1") long page,
+ @RequestParam(defaultValue = "10") long size,
+ @RequestParam(required = false) String visitorNameKeyword,
+ @RequestParam(required = false) String visitedUserNameKeyword,
+ @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate visitDate) {
+ String keyword = visitorNameKeyword != null && !visitorNameKeyword.isBlank()
+ ? visitorNameKeyword
+ : visitedUserNameKeyword;
+ return ResultUtil.page(
+ miniApprovalAggregateApplicationService.pageMyAll(
+ page, size, keyword, visitDate));
}
@Operation(summary = "经办人一级审批待办")
@@ -53,11 +76,15 @@
public Result<List<MiniHandlerApprovalTodoVo>> myHandlerTodo(
@RequestParam(defaultValue = "1") long page,
@RequestParam(defaultValue = "10") long size,
+ @RequestParam(required = false) String visitorNameKeyword,
@RequestParam(required = false) String visitedUserNameKeyword,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate visitDate) {
+ String keyword = visitorNameKeyword != null && !visitorNameKeyword.isBlank()
+ ? visitorNameKeyword
+ : visitedUserNameKeyword;
return ResultUtil.page(
miniHandlerApprovalApplicationService.pageMyTodo(
- page, size, visitedUserNameKeyword, visitDate));
+ page, size, keyword, visitDate));
}
@Operation(summary = "经办人一级审批处理")
@@ -67,7 +94,7 @@
return ResultUtil.success();
}
- @Operation(summary = "小程序其他节点审批处理（非经办人一级）")
+ @Operation(summary = "小程序其他节点审批处理")
@PostMapping("/action")
public Result<Void> action(@Valid @RequestBody MiniApprovalActionRequest request) {
miniHandlerApprovalApplicationService.handleOtherAction(request);
@@ -92,3 +119,4 @@
return ResultUtil.data(miniApprovalDetailApplicationService.detail(taskId, taskUuid, orderId, orderUuid));
}
}
+
--
Gitblit v1.7.1