luofl
2025-03-16 00efb01d6b4f351c01928c349632100be01361b2
党员认证、党员上级角色切换
6个文件已修改
35 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/PartyMemberMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
@@ -126,6 +126,13 @@
        Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
        List<Integer> permissions = new ArrayList<>();
        IdentityInformationVO identityInformationVO = new IdentityInformationVO();
        if (partyMember != null){
            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
        }
        if (systemUser != null){
            identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
        }
        identityInformationVO.setIdentity(identity);
        identityInformationVO.setIsPartymember(partyMember != null);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
@@ -12,6 +12,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +25,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Objects;
@Api(tags = {"小程序-党员管理"})
@@ -52,6 +59,8 @@
        return R.ok();
    }
    /**
     * 党员信息详情
     */
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/PartyMemberMapper.java
@@ -40,7 +40,7 @@
     * 党员待审核申请列表
     */
    Page<PendingPartyMemberApplicationVO> queryPreAuditPage(@Param("page") Page<PendingPartyMemberApplicationVO> page,
                                                            @Param("userId") Long userId,
                                                            @Param("phone") String phone,
                                                            @Param("accountLevel") Integer accountLevel,
                                                            @Param("districtsCode") String districtsCode,
                                                            @Param("streetId") String streetId,
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.sangeshenbian.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -135,7 +136,11 @@
        partyMember.setPhone(loginUserInfo.getPhone());
        partyMember.setGender(getGender(idNumber));
        partyMember.setCreateBy(loginUserInfo.getUserId());
        partyMember.setUpdateBy(loginUserInfo.getUserId());
        partyMember.setAuditStatus(AuditStatusEnum.PENDING.getCode());
        partyMember.setCreateTime(DateUtil.date());
        partyMember.setUpdateTime(DateUtil.date());
        partyMember.setSource(0);
        saveOrUpdate(partyMember);
    }
@@ -179,8 +184,8 @@
        } else if(accountLevel != ReportTypeEnum.PARTY.getCode()){
            throw new ServiceException("无权审核:未知等级");
        }
        Long userId = loginUserInfo.getUserId();
        return this.baseMapper.queryPreAuditPage(page, userId, accountLevel, districtsCode, streetId, communityId);
        String phone = loginUserInfo.getPhone();
        return this.baseMapper.queryPreAuditPage(page, phone, accountLevel, districtsCode, streetId, communityId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/IdentityInformationVO.java
@@ -16,6 +16,12 @@
    private Integer identity;
    /**
     * 是否冻结
     */
    @ApiModelProperty(value = "是否冻结")
    private Boolean isFrozen;
    /**
     * 是否认证党员信息
     */
    @ApiModelProperty(value = "是否认证党员信息")
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/PartyMemberMapper.xml
@@ -128,7 +128,7 @@
        FROM
            sgsb_party_member
        WHERE
            audit_status = 0 and create_by != ${userId}
            audit_status = 0 and phone != ${phone}
        <if test="accountLevel==2">
            and districts_code = #{districtsCode}
        </if>