From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/company/src/main/java/com/doumee/api/business/MemberController.java |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index fafd693..760403d 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -10,6 +10,7 @@
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.dto.MemberImport;
 import com.doumee.dao.business.dto.MemberQueryDTO;
+import com.doumee.dao.business.dto.MemberReduceImport;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.MemberInsurance;
 import com.doumee.service.business.MemberService;
@@ -80,8 +81,6 @@
     @PostMapping("/page")
     @RequiresPermissions("business:member:query")
     public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
-//        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-//        pageWrap.getModel().setCompanyId(user.getCompanyId());
         return ApiResponse.success(memberService.findPageForCompany(pageWrap));
     }
 
@@ -89,14 +88,6 @@
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:member:exportExcel")
     public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
-     /*   LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        pageWrap.getModel().setCompanyId(user.getCompanyId());
-        List<Member> list = memberService.findPageForCompany(pageWrap).getRecords();
-        for (int i = 0; i < list.size(); i++) {
-            Member member = list.get(i);
-            member.setSn(i+1);
-            member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
-        }*/
         ExcelExporter.build(Member.class).exportWithFirstAndEnd( memberService.findPageForCompany(pageWrap).getRecords(), "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
     }
 
@@ -106,7 +97,7 @@
     @GetMapping("/{id}")
     @RequiresPermissions("business:member:query")
     public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(memberService.findById(id));
+        return ApiResponse.success(memberService.findDetailById(id));
     }
 
 
@@ -122,14 +113,28 @@
     }
 
 
+
+
+
     @ApiOperation(value = "浜哄憳淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
     @PostMapping("/importExcel")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
     })
-    @RequiresPermissions("business:worktype:create")
-    public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file) {
-        return ApiResponse.success(memberService.importBatch(file));
+    @RequiresPermissions("business:member:importExcel")
+    public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file,Integer  solutionId) {
+        return ApiResponse.success(memberService.importBatch(file,solutionId));
+    }
+
+
+    @ApiOperation(value = "浜哄憳鍑忎繚淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
+    @PostMapping("/importReuduceExcel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+    })
+    @RequiresPermissions("business:member:importExcel")
+    public ApiResponse<List<MemberReduceImport>> importReuduceExcel (@ApiParam(value = "file") MultipartFile file, Integer  applyId) {
+        return ApiResponse.success(memberService.importReduceBatch(file,applyId));
     }
 
 }

--
Gitblit v1.9.3