Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java

@@ -4,6 +4,7 @@
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;
@@ -40,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();
    }
@@ -50,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();
    }
@@ -64,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)));
    }

    /**
@@ -73,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()));
    }