From 0af331c7df1f4e3365b3cb5abd60eaaa09807513 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 16 Sep 2021 09:01:41 +0800
Subject: [PATCH] 1.社保
---
src/main/java/org/springblade/modules/member/controller/MemberController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 f66a578..e16ded4 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -29,6 +29,7 @@
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;
@@ -39,7 +40,10 @@
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;
/**
* 控制器
@@ -133,12 +137,12 @@
/**
* 主要管理员信息
- * @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);
}
@@ -156,4 +160,23 @@
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