From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 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 6e8812d..e16ded4 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -22,17 +22,28 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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.equipage.excel.EquipageExcel;
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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
/**
* 控制器
@@ -87,7 +98,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
- public R save(@Valid @RequestBody Member member) {
+ public R save(@Valid @RequestBody Member member) throws Exception {
+ //arg.test01(arg.url+"/member/save",member);
return R.status(memberService.save(member));
}
@@ -97,7 +109,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));
}
@@ -124,13 +137,46 @@
/**
* 主要管理员信息
- * @param creditcode
+ * @param member
* @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("操作成功");
+ }
+
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportMember(HttpServletResponse response) {
+ List<memberExcel> list = new ArrayList<>();
+ memberExcel member = new memberExcel();
+ member.setCreditcode("xx12351214112");
+ member.setName("张三");
+ member.setPost("经理");
+ member.setCardid("360***********0001");
+ member.setCell("131********");
+ member.setRtime("2020/01/01");
+ list.add(member);
+ ExcelUtil.export(response, "主要管理人员数据导入模板", "主要管理人员导入数据表", list, memberExcel.class);
+ }
+
}
--
Gitblit v1.9.3