From be9179e444b22bf7d4b69c64745decd91696d67b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:28:48 +0800
Subject: [PATCH] 1.诉求新增录音 2.上级多角色调整
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 9f3b07a..47f0bd0 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
@@ -1,8 +1,10 @@
package com.panzhihua.sangeshenbian.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.PartyMember;
@@ -15,6 +17,7 @@
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;
@@ -38,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();
}
@@ -48,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();
}
@@ -66,7 +80,8 @@
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
String phone = loginUserInfo.getPhone();
return R.ok(partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>()
- .eq(PartyMember::getPhone, phone)));
+ .eq(PartyMember::getPhone, phone)
+ .eq(PartyMember::getDelFlag, 0)));
}
/**
@@ -74,7 +89,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()));
}
@@ -98,6 +113,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