From 729f3af10a01c2179d08d7f15b0015a0b86a6a08 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 15:39:29 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtPartyMemberController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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..4401ff1 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
@@ -8,6 +8,7 @@
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
+import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.warpper.PartyMemberQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,19 +16,12 @@
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.IOException;
+import java.util.List;
/**
* <p>
@@ -96,16 +90,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) @PathVariable("phone") String phone){
+ return R.ok(partyMemberService.verifyPartyMemberByPhone(phone));
+ }
}
--
Gitblit v1.7.1