From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
index da0ea4f..33ad420 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.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.information.excel.InforExcel;
+import org.springblade.modules.information.excel.InforImporter;
import org.springblade.modules.shareholder.entity.Shareholder;
+import org.springblade.modules.shareholder.excel.shareExcel;
+import org.springblade.modules.shareholder.excel.shareImporter;
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
@@ -89,8 +95,8 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入shareholder")
public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
- arg arg = new arg();
- arg.test01(arg.url+"/shareholder/save",shareholder);
+ //arg arg = new arg();
+ //arg.test01(arg.url+"/shareholder/save",shareholder);
return R.status(shareholderService.save(shareholder));
}
@@ -100,7 +106,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入shareholder")
- public R update(@Valid @RequestBody Shareholder shareholder) {
+ public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
+ //arg.test01(arg.url+"/shareholder/update",shareholder);
return R.status(shareholderService.updateById(shareholder));
}
@@ -136,5 +143,16 @@
return R.data(pages);
}
+ /**
+ * 导入投资人信息
+ */
+ @PostMapping("import-share")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入投资人", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ shareImporter shareImporter = new shareImporter(shareholderService, false);
+ ExcelUtil.save(file, shareImporter, shareExcel.class);
+ return R.success("操作成功");
+ }
}
--
Gitblit v1.9.3