From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/business/MemberInsuranceController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberInsuranceController.java b/server/company/src/main/java/com/doumee/api/business/MemberInsuranceController.java
index 22f6137..5c20332 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberInsuranceController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberInsuranceController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.MemberInsurance;
import com.doumee.service.business.MemberInsuranceService;
import io.swagger.annotations.Api;
@@ -74,11 +75,27 @@
return ApiResponse.success(memberInsuranceService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/findList")
+ @RequiresPermissions("business:memberinsurance:query")
+ public ApiResponse<List<MemberInsurance>> findList (@RequestBody MemberInsurance memberInsurance) {
+ return ApiResponse.success(memberInsuranceService.getList(memberInsurance));
+ }
+
+
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:memberinsurance:exportExcel")
public void exportExcel (@RequestBody PageWrap<MemberInsurance> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(MemberInsurance.class).export(memberInsuranceService.findPage(pageWrap).getRecords(), "鍛樺伐鎶曚繚鏄庣粏璁板綍", response);
+ List<MemberInsurance> list = memberInsuranceService.findPage(pageWrap).getRecords();
+ for (int i = 0; i < list.size(); i++) {
+ MemberInsurance memberInsurance = list.get(i);
+ memberInsurance.setSn(i+1);
+ }
+ ExcelExporter.build(MemberInsurance.class).exportWithFirstAndEnd(list,
+ "浜哄憳鎶曚繚璇﹀崟_濮撳悕锛�"+pageWrap.getModel().getMemberName() +"_韬唤璇佸彿锛�"+pageWrap.getModel().getIdcardNo(),
+ "浜哄憳鎶曚繚璇﹀崟_濮撳悕锛�"+pageWrap.getModel().getMemberName() +"_韬唤璇佸彿锛�"+pageWrap.getModel().getIdcardNo(),null, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3