添加枚举类&&规范代码

puhanshu

2021-09-14 bb9ee0164a6bf83a3bbf60809313fe6aaf4627e8

添加枚举类&&规范代码

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IdentityAuthApi.java

@@ -1,8 +1,8 @@
package com.panzhihua.applets.api;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO;
import com.panzhihua.common.service.community.CommunityService;

import io.swagger.annotations.Api;
@@ -52,13 +53,13 @@

    @ApiOperation(value = "身份认证获取EidToken接口")
    @PostMapping("/getEidToken")
    public R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO) {
    public R getEidToken(@RequestBody @Valid GetIdentityEidTokenDTO getIdentityEidTokenDTO) {
        return communityService.getEidToken(getIdentityEidTokenDTO);
    }

    @ApiOperation(value = "新增身份认证")
    @PostMapping("/add")
    public R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO) {
    public R addIdentityAuth(@RequestBody @Valid AddIdentityAuthDTO addIdentityAuthDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addIdentityAuthDTO.setSubmitUserId(loginUserInfo.getUserId());
        addIdentityAuthDTO.setCommunityId(loginUserInfo.getCommunityId());
@@ -67,7 +68,7 @@

    @ApiOperation(value = "分页查询身份认证记录", response = IdentityAuthRecordDetailVO.class)
    @PostMapping("/record/page")
    public R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO) {
    public R queryRecordWithPage(@RequestBody @Valid PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO) {
        pageIdentityAuthRecordDTO.setSubmitUserId(this.getUserId());
        return communityService.queryRecordWithPage(pageIdentityAuthRecordDTO);
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityApprovalStatusEnum.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @title: IdentityApprovalStatusEnum
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 身份认证审核状态枚举类
 * @author: hans
 * @date: 2021/09/14 11:26
 */
@Getter
public enum IdentityApprovalStatusEnum {
    /**
     * 待审核
     */
    PENDING_REVIEW(1),
    /**
     * 驳回
     */
    REFUSE(2),
    /**
     * 通过
     */
    PASS_THROUGH(3);

    private int status;

    IdentityApprovalStatusEnum(int status) {
        this.status = status;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthMethodEnum.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @title: IdentityAuthMethodEnum
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 身份认证方式枚举类
 * @author: hans
 * @date: 2021/09/14 13:11
 */
@Getter
public enum IdentityAuthMethodEnum {
    /**
     * 视频认证
     */
    VIDEO_AUTH(1),
    /**
     * 人脸核验
     */
    FACE_AUTH(2),
    /**
     * 线下认证
     */
    OFFLINE_AUTH(3);

    private int method;

    IdentityAuthMethodEnum(int method) {
        this.method = method;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthStatusEnum.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @title: IdentityAuthStatusEnum
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 身份认证认证状态枚举类
 * @author: hans
 * @date: 2021/09/14 11:30
 */
@Getter
public enum IdentityAuthStatusEnum {
    /**
     * 已认证
     */
    CERTIFIED(1),
    /**
     * 未认证
     */
    NOT_CERTIFIED(0);

    private int status;

    IdentityAuthStatusEnum(int status) {
        this.status = status;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthTypeEnum.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * @title: IdentityAuthTypeEnum
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 身份认证类型枚举类
 * @author: hans
 * @date: 2021/09/14 10:40
 */
@Getter
public enum IdentityAuthTypeEnum {
    /**
     * 高龄认证
     */
    ELDER_AUTH(1),
    /**
     * 养老认证
     */
    PENSION_AUTH(2);

    private int type;

    IdentityAuthTypeEnum(int type) {
        this.type = type;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java

@@ -26,23 +26,23 @@
public class AddIdentityAuthDTO {

    @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
    @NotNull
    @NotNull(message = "认证类型不能为空")
    private Integer authType;

    @ApiModelProperty(value = "姓名", required = true, example = "张三")
    @Sensitive(strategy = SensitiveStrategy.USERNAME)
    @NotBlank
    @NotBlank(message = "姓名不能为空")
    private String name;

    @ApiModelProperty(value = "身份证号", required = true, example = "511321199503241233")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    @EncryptDecryptField
    @NotBlank
    @Size(min = 18, max = 18)
    @NotBlank(message = "身份证号码不能为空")
    @Size(min = 18, max = 18, message = "请输入18位有效身份证号")
    private String idCard;

    @ApiModelProperty(value = "现居住地址", required = true, example = "双流小区")
    @NotBlank
    @NotBlank(message = "居住地址不能为空")
    private String address;

    @ApiModelProperty(value = "认证视频url，视频认证时需传入", example = "http://test.video.html")
@@ -57,8 +57,8 @@
    @ApiModelProperty(value = "人脸核身结果数据", hidden = true)
    private String verificationResult;

    @ApiModelProperty(value = "身份认证方式 1.视频认证 2.人脸认证", hidden = true)
    private Integer type = 1;
    @ApiModelProperty(value = "身份认证方式 1.视频认证 2.人脸认证 3.线下认证", hidden = true)
    private Integer authMethod = 1;

    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GetIdentityEidTokenDTO.java

@@ -26,18 +26,18 @@
public class GetIdentityEidTokenDTO {

    @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
    @NotNull
    @NotNull(message = "认证类型不能为空")
    private Integer authType;

    @ApiModelProperty(value = "姓名", required = true, example = "张三")
    @Sensitive(strategy = SensitiveStrategy.USERNAME)
    @NotBlank
    @NotBlank(message = "姓名不能为空")
    private String name;

    @ApiModelProperty(value = "身份证号", required = true, example = "511321199503241233")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    @EncryptDecryptField
    @NotBlank
    @Size(min = 18, max = 18)
    @NotBlank(message = "身份证号码不能为空")
    @Size(min = 18, max = 18, message = "请输入18位有效身份证号")
    private String idCard;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageIdentityAuthRecordDTO.java

@@ -21,17 +21,17 @@
public class PageIdentityAuthRecordDTO {

    @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
    @NotNull
    @NotNull(message = "认证类型不能为空")
    private Integer authType;

    @ApiModelProperty(value = "当前页数", required = true, example = "1")
    @NotNull
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "每页记录数", required = true, example = "10")
    @NotNull
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

    @ApiModelProperty(value = "提交用户", example = "1")
    @ApiModelProperty(value = "提交用户", example = "1", hidden = true)
    private Long submitUserId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/IdentityAuthApi.java

@@ -1,5 +1,8 @@
package com.panzhihua.service_community.api;

import static com.panzhihua.common.enums.IdentityAuthMethodEnum.FACE_AUTH;
import static com.panzhihua.common.enums.IdentityAuthTypeEnum.ELDER_AUTH;
import static com.panzhihua.common.enums.IdentityAuthTypeEnum.PENSION_AUTH;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isBlank;

@@ -88,13 +91,13 @@
                log.error("人脸核验失败，错误原因：" + textObject.toJSONString());
                return R.fail("核验失败");
            }
            addIdentityAuthDTO.setType(2);
            addIdentityAuthDTO.setAuthMethod(FACE_AUTH.getMethod());
            addIdentityAuthDTO.setVerificationResult(object.toJSONString());
        }
        int authType = addIdentityAuthDTO.getAuthType().intValue();
        if (authType == 1) {
        if (authType == ELDER_AUTH.getType()) {
            return comElderAuthRecordsService.addElderAuth(addIdentityAuthDTO);
        } else if (authType == 2) {
        } else if (authType == PENSION_AUTH.getType()) {
            return comPensionAuthRecordService.addPensionAuth(addIdentityAuthDTO);
        } else {
            return R.fail("请核对需要认证的类型");
@@ -108,10 +111,10 @@
     */
    @PostMapping("/record/page")
    public R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO) {
        Integer authType = pageIdentityAuthRecordDTO.getAuthType();
        if (nonNull(authType) && authType.intValue() == 1) {
        int authType = pageIdentityAuthRecordDTO.getAuthType().intValue();
        if (authType == ELDER_AUTH.getType()) {
            return comElderAuthRecordsService.queryRecordWithPage(pageIdentityAuthRecordDTO);
        } else if (nonNull(authType) && authType.intValue() == 2) {
        } else if (authType == PENSION_AUTH.getType()) {
            return comPensionAuthRecordService.queryRecordWithPage(pageIdentityAuthRecordDTO);
        } else {
            return R.fail("请核对需要查询的身份认证类型");
@@ -127,9 +130,9 @@
    @GetMapping("/detail")
    public R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
                                        @RequestParam("identityAuthId") Long identityAuthId) {
        if (authType.intValue() == 1) {
        if (authType.intValue() == ELDER_AUTH.getType()) {
            return comElderAuthRecordsService.retrieveElderAuthDetail(identityAuthId);
        } else if (authType.intValue() == 2) {
        } else if (authType.intValue() == PENSION_AUTH.getType()) {
            return comPensionAuthRecordService.retrievePensionAuthDetail(identityAuthId);
        } else {
            return R.fail("请核对认证类型");
@@ -146,10 +149,10 @@
    public R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
                                 @RequestParam(value = "identityAuthType") Integer identityAuthType) {
        String identityCode;
        if (identityAuthType.intValue() ==1) {
        if (identityAuthType.intValue() == ELDER_AUTH.getType()) {
            //高龄认证
            identityCode = ELDER_AUTH_TYPE_PREFIX + communityId;
        } else if (identityAuthType.intValue() ==2) {
        } else if (identityAuthType.intValue() == PENSION_AUTH.getType()) {
            //养老认证
            identityCode = PENSION_AUTH_TYPE_PREFIX + communityId;
        } else {
@@ -181,12 +184,12 @@
            log.error("加密失败【{}】", e.getMessage());
            return R.fail("认证失败，请重新尝试");
        }
        if (getIdentityEidTokenDTO.getAuthType().intValue() == 1) {
        if (getIdentityEidTokenDTO.getAuthType().intValue() == ELDER_AUTH.getType()) {
            //高龄认证
            isExist = comElderAuthElderliesDAO.selectCount(new QueryWrapper<ComElderAuthElderliesDO>()
                    .lambda().eq(ComElderAuthElderliesDO::getName, getIdentityEidTokenDTO.getName())
                    .eq(ComElderAuthElderliesDO::getIdCard, idCard));
        } else if (getIdentityEidTokenDTO.getAuthType().intValue() == 2) {
        } else if (getIdentityEidTokenDTO.getAuthType().intValue() == PENSION_AUTH.getType()) {
            //养老认证
            isExist = comPensionAuthPensionerDAO.selectCount(new QueryWrapper<ComPensionAuthPensionerDO>()
                    .lambda().eq(ComPensionAuthPensionerDO::getName, getIdentityEidTokenDTO.getName())

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java

@@ -50,7 +50,7 @@
    /**
     * 身份认证方式 1.视频认证 2.人脸认证
     */
    private Integer type;
    private Integer authMethod;

    /**
     * 人脸核验结果数据

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java

@@ -45,7 +45,7 @@
    /**
     * 身份认证方式 1.视频认证 2.人脸认证
     */
    private Integer type;
    private Integer authMethod;

    /**
     * 人脸核验结果数据

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java

@@ -48,6 +48,11 @@

import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PASS_THROUGH;
import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PENDING_REVIEW;
import static com.panzhihua.common.enums.IdentityAuthMethodEnum.FACE_AUTH;
import static com.panzhihua.common.enums.IdentityAuthStatusEnum.CERTIFIED;

/**
 * title: ComElderAuthRecordsServiceImpl  社区政务》高龄老人认证》认证记录表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
@@ -112,8 +117,8 @@
            return R.fail("未查询到高龄老人认证记录");
        }
        BeanUtils.copyProperties(comElderAuthRecordVO, comElderAuthRecordsDO);
        if (comElderAuthRecordVO.getApprovalStatus().equals(3)) {
            comElderAuthRecordsDO.setAuthStatus(1);
        if (comElderAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) {
            comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        }
        comElderAuthRecordsDO.setApprovalDate(new Date());
        int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO);
@@ -214,7 +219,7 @@
                                        eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod));
                                if (null != comElderAuthRecordsDO) {
                                    //存在记录且状态为已认证，不能修改
                                    if (comElderAuthRecordsDO.getAuthStatus().equals(1)) {
                                    if (comElderAuthRecordsDO.getAuthStatus().equals(CERTIFIED.getStatus())) {
                                        ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
                                        BeanUtils.copyProperties(vo, mistake);
                                        setMistake(mistake, vo);
@@ -331,9 +336,9 @@
        BeanUtils.copyProperties(vo, comElderAuthRecordsDO);
        comElderAuthRecordsDO.setSubmitUserId(userId);
        comElderAuthRecordsDO.setApproverId(userId);
        comElderAuthRecordsDO.setApprovalStatus(3);
        comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
        comElderAuthRecordsDO.setApprovalDate(new Date());
        comElderAuthRecordsDO.setAuthStatus(1);
        comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        return comElderAuthRecordsDO;
    }

@@ -345,9 +350,9 @@
        comElderAuthRecordsDO.setAuthPeriod(authPeriod);
        comElderAuthRecordsDO.setSubmitUserId(userId);
        comElderAuthRecordsDO.setApproverId(userId);
        comElderAuthRecordsDO.setApprovalStatus(3);
        comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
        comElderAuthRecordsDO.setApprovalDate(new Date());
        comElderAuthRecordsDO.setAuthStatus(1);
        comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        return comElderAuthRecordsDO;
    }

@@ -391,7 +396,7 @@
            return R.fail("该人员未在社区报道无法认证");
        }
        boolean isInfoCorrect = !comElderAuthElderliesDO.getName().equals(addIdentityAuthDTO.getName()) ||
                !(comElderAuthElderliesDO.getIsRegister() && comElderAuthElderliesDO.getIsAlive());
                !(comElderAuthElderliesDO.getIsRegister().equals(1) && comElderAuthElderliesDO.getIsAlive().equals(1));
        if (isInfoCorrect) {
            return R.fail("信息有误,请检查!");
        }
@@ -402,10 +407,14 @@
                        .eq(ComElderAuthRecordsDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus().equals(1)).findFirst().isPresent()) {
            boolean alreadyAuth = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent();
            if (alreadyAuth) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
            }
            if (currentAuthPeriodRecords.stream().filter(record -> record.getApprovalStatus().intValue() == 1).findFirst().isPresent()) {
            boolean isPendingReview = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent();
            if (isPendingReview) {
                return R.fail("该人员本期有尚未审核的认证，请稍后再试！");
            }
        }
@@ -414,10 +423,10 @@
        comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId());
        comElderAuthRecordsDO.setAuthDate(dateNow);
        comElderAuthRecordsDO.setAuthPeriod(currentAuthPeriod);
        if (addIdentityAuthDTO.getType().intValue() == 2) {
            comElderAuthRecordsDO.setApprovalStatus(3);
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
            comElderAuthRecordsDO.setApprovalDate(dateNow);
            comElderAuthRecordsDO.setAuthStatus(1);
            comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        }
        if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
            return R.fail("认证失败，请重新尝试");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java

@@ -48,6 +48,11 @@

import lombok.extern.slf4j.Slf4j;

import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PASS_THROUGH;
import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PENDING_REVIEW;
import static com.panzhihua.common.enums.IdentityAuthMethodEnum.FACE_AUTH;
import static com.panzhihua.common.enums.IdentityAuthStatusEnum.CERTIFIED;

/**
 * @title: ComPensionAuthRecordServiceImpl
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
@@ -110,8 +115,8 @@
            return R.fail("未查询到养老认证记录");
        }
        BeanUtils.copyProperties(comPensionAuthRecordVO, comPensionAuthRecordDO);
        if (comPensionAuthRecordVO.getApprovalStatus().equals(3)) {
            comPensionAuthRecordDO.setAuthStatus(1);
        if (comPensionAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) {
            comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
        }
        comPensionAuthRecordDO.setApprovalDate(new Date());
        int nub = comPensionAuthRecordDAO.updateById(comPensionAuthRecordDO);
@@ -202,7 +207,7 @@
                                    eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod, authPeriod));
                            if (null != comPensionAuthRecordDO) {
                                //存在记录且状态为已认证，不能修改
                                if (comPensionAuthRecordDO.getAuthStatus().equals(1)) {
                                if (comPensionAuthRecordDO.getAuthStatus().equals(CERTIFIED.getStatus())) {
                                    ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
                                    BeanUtils.copyProperties(vo, mistake);
                                    setMistake(mistake, vo);
@@ -305,9 +310,9 @@
        BeanUtils.copyProperties(vo, comPensionAuthRecordsDO);
        comPensionAuthRecordsDO.setSubmitUserId(userId);
        comPensionAuthRecordsDO.setApproverId(userId);
        comPensionAuthRecordsDO.setApprovalStatus(3);
        comPensionAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
        comPensionAuthRecordsDO.setApprovalDate(new Date());
        comPensionAuthRecordsDO.setAuthStatus(1);
        comPensionAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        return comPensionAuthRecordsDO;
    }

@@ -319,9 +324,9 @@
        comPensionAuthRecordDO.setAuthPeriod(authPeriod);
        comPensionAuthRecordDO.setSubmitUserId(userId);
        comPensionAuthRecordDO.setApproverId(userId);
        comPensionAuthRecordDO.setApprovalStatus(3);
        comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
        comPensionAuthRecordDO.setApprovalDate(new Date());
        comPensionAuthRecordDO.setAuthStatus(1);
        comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
        return comPensionAuthRecordDO;
    }

@@ -375,10 +380,14 @@
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus().equals(1)).findFirst().isPresent()) {
            boolean alreadyAuth = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent();
            if (alreadyAuth) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
            }
            if (currentAuthPeriodRecords.stream().filter(record -> record.getApprovalStatus().intValue() == 1).findFirst().isPresent()) {
            boolean isPendingReview = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent();
            if (isPendingReview) {
                return R.fail("该人员本期有尚未审核的认证，请稍后再试！");
            }
        }
@@ -387,10 +396,10 @@
        comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
        comPensionAuthRecordDO.setAuthDate(dateNow);
        comPensionAuthRecordDO.setAuthPeriod(currentAuthPeriod);
        if (addIdentityAuthDTO.getType().intValue() == 2) {
            comPensionAuthRecordDO.setApprovalStatus(3);
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
            comPensionAuthRecordDO.setApprovalDate(dateNow);
            comPensionAuthRecordDO.setAuthStatus(1);
            comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
        }
        if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
            return R.fail("认证失败，请重新尝试");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml

@@ -7,7 +7,7 @@
                <id column="id" property="id" />
                <result column="elderlies_id" property="elderliesId" />
                <result column="auth_period" property="authPeriod" />
                <result column="type" property="type" />
                <result column="auth_method" property="authMethod" />
                <result column="verification_result" property="verificationResult" />
                <result column="submit_user_id" property="submitUserId" />
                <result column="auth_video" property="authVideo" />
@@ -25,7 +25,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, elderlies_id, auth_period, `type`, verification_result, submit_user_id, auth_video, address, approver_id, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
        id, elderlies_id, auth_period, auth_method, verification_result, submit_user_id, auth_video, address, approver_id, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
    </sql>

    <select id="pageElderAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComElderAuthRecordVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml

@@ -7,7 +7,7 @@
                <id column="id" property="id" />
                <result column="pensioner_id" property="pensionerId" />
                <result column="auth_period" property="authPeriod" />
                <result column="type" property="type" />
                <result column="auth_method" property="authMethod" />
                <result column="verification_result" property="verificationResult" />
                <result column="submit_user_id" property="submitUserId" />
                <result column="auth_video" property="authVideo" />
@@ -25,7 +25,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, pensioner_id, auth_period, `type`, verification_result, submit_user_id, auth_video, address, approver_id, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
        id, pensioner_id, auth_period, authMethod, verification_result, submit_user_id, auth_video, address, approver_id, approval_status, approval_date, mark, reject_reason, auth_status, auth_date, create_at, update_at
    </sql>

    <select id="pagePensionAuthRecords" resultType="com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO">