From 1d2fa9783d47a19650450b81fc4f2e6c97b1d4ac Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 15:38:13 +0800
Subject: [PATCH] 提交一把
---
server/company/src/main/java/com/doumee/api/business/MemberController.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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..cceaae3 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
@@ -80,8 +80,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 +87,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 +96,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 +112,17 @@
}
+
+
+
@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));
+ public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file,Integer solutionId) {
+ return ApiResponse.success(memberService.importBatch(file,solutionId));
}
}
--
Gitblit v1.9.3