From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/company/src/main/java/com/doumee/api/business/MemberController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 74eea2e..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;
@@ -96,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));
}
@@ -112,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