From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
index b7bb145..8b2ddd3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
@@ -4,13 +4,10 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.sangeshenbian.model.entity.BcRegion;
-import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
-import com.panzhihua.sangeshenbian.service.IBcRegionService;
-import com.panzhihua.sangeshenbian.service.IComActService;
-import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.warpper.PartyMemberApplicationRequest;
import com.panzhihua.sangeshenbian.warpper.PartyMemberAuditRequest;
@@ -20,24 +17,23 @@
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
-import java.util.List;
import java.util.Objects;
@Api(tags = {"小程序-党员管理"})
@Validated
-@RestController("/applet/party-member")
+@RestController
+@RequestMapping("/applet/party-member")
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class PartyMemberController extends BaseController {
private final IPartyMemberService partyMemberService;
- private final IBcRegionService bcRegionService;
- private final IComStreetService comStreetService;
- private final IComActService comActService;
/**
* 党员申请
@@ -45,6 +41,12 @@
@ApiOperation(value = "党员申请")
@PostMapping("/apply")
public R<?> apply(@Valid @RequestBody PartyMemberApplicationRequest dto) {
+ int count = partyMemberService.count(new LambdaQueryWrapper<PartyMember>()
+ .eq(PartyMember::getPhone, getLoginUserInfo().getPhone())
+ .eq(PartyMember::getDelFlag, 0));
+ if (count > 0){
+ return R.fail("您已提交过申请，请勿重复提交");
+ }
partyMemberService.applyForMembership(dto, getLoginUserInfo());
return R.ok();
}
@@ -55,9 +57,14 @@
@ApiOperation(value = "编辑党员信息")
@PostMapping("/edit")
public R<?> edit(@Valid @RequestBody PartyMemberApplicationRequest dto) {
- if (Objects.isNull(dto.getId())){
- return R.fail("id不能为空");
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ String phone = loginUserInfo.getPhone();
+ PartyMember partyMember = partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
+ .eq(PartyMember::getPhone, phone));
+ if (partyMember == null){
+ return R.fail("请先完善党员信息");
}
+ dto.setId(partyMember.getId());
partyMemberService.applyForMembership(dto, getLoginUserInfo());
return R.ok();
}
@@ -69,8 +76,11 @@
*/
@ApiOperation(value = "党员信息详情")
@PostMapping("/detail")
- public R<?> detail(@RequestParam Long id) {
- return R.ok(partyMemberService.getById(id));
+ public R<?> detail() {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ String phone = loginUserInfo.getPhone();
+ return R.ok(partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
+ .eq(PartyMember::getPhone, phone)));
}
/**
@@ -78,7 +88,7 @@
*/
@ApiOperation(value = "党员待审核列表")
@PostMapping("/pre-audit-list")
- public R<?> preAuditList(Page<PendingPartyMemberApplicationVO> page) {
+ public R<Page<PendingPartyMemberApplicationVO>> preAuditList(Page<PendingPartyMemberApplicationVO> page) {
return R.ok(partyMemberService.preAuditList(page,getLoginUserInfo()));
}
@@ -102,6 +112,25 @@
return R.ok();
}
+ /**
+ * 确认党员信息
+ */
+ @GetMapping("/confirm-party-member-info")
+ @ApiOperation("确认党员信息")
+ public R<?> confirmPartyMemberInfo() {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ // 获取党员信息
+ PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
+ .eq(PartyMember::getPhone, loginUserInfo.getPhone())
+ .eq(PartyMember::getDelFlag, 0));
+ if (partyMember == null){
+ return R.fail("请先完善党员信息");
+ }
+ partyMember.setIsConfirm(1);
+ partyMemberService.updateById(partyMember);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1