From 44c6754be97b8772a915f7bc54b44ac736c7673b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 16 三月 2025 00:47:54 +0800
Subject: [PATCH] 管理后台-党员管理 党员导入 管理后台-诉求管理
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java
index 0e1177d..bef642c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/PartyMemberController.java
@@ -6,11 +6,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
+import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
@@ -29,6 +29,7 @@
import javax.validation.Valid;
import java.io.IOException;
+import java.util.List;
/**
* <p>
@@ -97,10 +98,13 @@
}
@ApiOperation("导入")
@PostMapping("/import")
- public R<?> importExcel(@RequestPart("file") MultipartFile file) {
+ public R<List<PartyMemberImportFailedVO> > importExcel(@RequestPart("file") MultipartFile file) {
SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
- partyMemberService.importExcel(loginUserInfo);
- return R.ok();
+ try {
+ return R.ok(partyMemberService.importExcel(file,loginUserInfo));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
@ApiOperation("审核")
@GetMapping("/audit/{id}")
--
Gitblit v1.7.1