From 790b1289743814fc378ca62532d7be4534455668 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 三月 2025 14:48:36 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java
index 6f98c2c..48aad36 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java
@@ -6,6 +6,7 @@
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;
@@ -28,6 +29,7 @@
import javax.validation.Valid;
import java.io.IOException;
+import java.util.List;
/**
* <p>
@@ -96,16 +98,24 @@
}
@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}")
+ @PostMapping("/audit")
public R<?> audit(@RequestBody PartyMemberDTO dto) {
SystemUserVo loginUserInfo = getLoginUserInfoSanGeShenBian();
partyMemberService.audit(dto,loginUserInfo);
return R.ok();
}
+ @ApiOperation("校验手机号是否注册党员")
+ @GetMapping("/verify/{phone}")
+ public R<Boolean> verify(@ApiParam(name = "phone",value = "电话号码",required = true) String phone){
+ return R.ok(partyMemberService.verifyPartyMemberByPhone(phone));
+ }
}
--
Gitblit v1.7.1