From aabd3fb155475168427f1c14966beb873bff6763 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期二, 25 八月 2026 19:31:46 +0800
Subject: [PATCH] fix: complete appointment management data and filters
---
talent-card-server/src/main/java/com/talentcard/server/business/admin/ServiceAppointmentAdminController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/ServiceAppointmentAdminController.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/ServiceAppointmentAdminController.java
index 7813a77..d9b20ca 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/ServiceAppointmentAdminController.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/ServiceAppointmentAdminController.java
@@ -47,13 +47,15 @@
@Parameter(description = "联系电话") @RequestParam(required = false) String applicantMobile,
@Parameter(description = "服务机构关键词") @RequestParam(required = false) String serviceKeyword,
@Parameter(description = "人才卡等级") @RequestParam(required = false) String cardLevel,
+ @Parameter(description = "是否使用补贴：是、否") @RequestParam(required = false) String subsidy,
+ @Parameter(description = "提交类型：新增、修改") @RequestParam(required = false) String submissionType,
@Parameter(description = "处理状态") @RequestParam(required = false) String status,
@Parameter(description = "提交开始日期，格式yyyy-MM-dd") @RequestParam(required = false) String submittedStart,
@Parameter(description = "提交结束日期，格式yyyy-MM-dd") @RequestParam(required = false) String submittedEnd,
@Parameter(description = "页码") @RequestParam(defaultValue = "1") int page,
@Parameter(description = "每页条数") @RequestParam(defaultValue = "10") int size
) {
- return ApiResponse.success(service.page(applicationType, keyword, applicantName, applicantMobile, serviceKeyword, cardLevel, status, submittedStart, submittedEnd, page, size));
+ return ApiResponse.success(service.page(applicationType, keyword, applicantName, applicantMobile, serviceKeyword, cardLevel, subsidy, submissionType, status, submittedStart, submittedEnd, page, size));
}
@Operation(summary = "预约申请详情", description = "查看预约申请完整信息，包含服务快照、申请人、配偶或子女信息")
@@ -86,12 +88,14 @@
@Parameter(description = "联系电话") @RequestParam(required = false) String applicantMobile,
@Parameter(description = "服务机构关键词") @RequestParam(required = false) String serviceKeyword,
@Parameter(description = "人才卡等级") @RequestParam(required = false) String cardLevel,
+ @Parameter(description = "是否使用补贴：是、否") @RequestParam(required = false) String subsidy,
+ @Parameter(description = "提交类型：新增、修改") @RequestParam(required = false) String submissionType,
@Parameter(description = "处理状态") @RequestParam(required = false) String status,
@Parameter(description = "提交开始日期，格式yyyy-MM-dd") @RequestParam(required = false) String submittedStart,
@Parameter(description = "提交结束日期，格式yyyy-MM-dd") @RequestParam(required = false) String submittedEnd,
HttpServletResponse response
) throws IOException {
- byte[] data = service.exportExcel(applicationType, keyword, applicantName, applicantMobile, serviceKeyword, cardLevel, status, submittedStart, submittedEnd);
+ byte[] data = service.exportExcel(applicationType, keyword, applicantName, applicantMobile, serviceKeyword, cardLevel, subsidy, submissionType, status, submittedStart, submittedEnd);
String filename = URLEncoder.encode("预约申请列表.xlsx", StandardCharsets.UTF_8).replace("+", "%20");
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
response.setContentType(MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet").toString());
@@ -100,4 +104,4 @@
response.getOutputStream().write(data);
response.flushBuffer();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.7.1