From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index 857e157..7b652aa 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -24,14 +24,20 @@
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.member.entity.Member;
+import org.springblade.modules.member.excel.memberExcel;
+import org.springblade.modules.member.excel.memberImporter;
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
+import org.springblade.modules.shareholder.excel.shareExcel;
+import org.springblade.modules.shareholder.excel.shareImporter;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
@@ -89,8 +95,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
public R save(@Valid @RequestBody Member member) throws Exception {
- arg arg = new arg();
- arg.test01(arg.url+"/member/save",member);
+ //arg.test01(arg.url+"/member/save",member);
return R.status(memberService.save(member));
}
@@ -100,7 +105,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
- public R update(@Valid @RequestBody Member member) {
+ public R update(@Valid @RequestBody Member member) throws Exception {
+ //arg.test01(arg.url+"/member/update",member);
return R.status(memberService.updateById(member));
}
@@ -131,9 +137,23 @@
* @return
*/
@PostMapping("/selectMemberInfo")
- public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
- IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
+ public R<IPage<MemberVO>> selectMemberInfo(Member member,Query query) {
+ IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), member);
return R.data(pages);
}
+
+
+ /**
+ * 导入管理人信息
+ */
+ @PostMapping("import-member")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入投资人", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ memberImporter memberImporter = new memberImporter(memberService, false);
+ ExcelUtil.save(file, memberImporter, memberExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3