From 780a43e411b6aabaabdd7d5dadbc9b0cf32353d4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 六月 2025 15:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
index 48b50ec..43f74a6 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java
@@ -108,7 +108,7 @@
i.setFee(BigDecimal.ZERO);
}
});
- ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","鍦ㄤ繚浜哄憳鍚嶅崟",null, response);
+ ExcelExporter.build(ApplyDetail.class).exportWithSheetAndFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","銆�"+pageWrap.getModel().getSolutionName()+"銆�"+"淇濆崟浜哄憳淇℃伅",null, "淇濆崟浜哄憳",response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -126,6 +126,13 @@
}
+ @ApiOperation("鏌ヨ浜哄憳鍙姤妗堟暟鎹�")
+ @GetMapping("/getMemberSettleClaimsList")
+ public ApiResponse<List<ApplyDetail>> getMemberSettleClaimsList(@RequestParam Integer memberId) {
+ return ApiResponse.success(applyDetailService.getMemberSettleClaimsList(memberId));
+ }
+
+
}
--
Gitblit v1.9.3