修复议事投票小程序bug

puhanshu

2021-09-18 f0d44c4bf251611e80cbb736b85e7768ad88eb4a

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

@@ -9,6 +9,10 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComElderAuthRecordExcleVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordStatisticExcleVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -43,6 +47,11 @@
import com.panzhihua.service_community.service.ComElderAuthRecordsService;

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  社区政务》高龄老人认证》认证记录表服务实现类
@@ -108,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);
@@ -210,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);
@@ -327,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;
    }

@@ -341,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;
    }

@@ -366,14 +375,6 @@
        return ObjectUtils.isEmpty(hashMap.get(key));
    }

    @Resource
    private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;

    @Value("${domain.aesKey:}")
    private String aesKey;

    /**
     * 新增高龄认证
     * @param addIdentityAuthDTO 请求参数
@@ -395,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("信息有误,请检查!");
        }
@@ -406,10 +407,14 @@
                        .eq(ComElderAuthRecordsDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            if (currentAuthPeriodRecords.stream().filter(record -> record.getAuthStatus()).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("该人员本期有尚未审核的认证，请稍后再试！");
            }
        }
@@ -418,19 +423,15 @@
        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(true);
            comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
        }
        if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) {
            return R.fail("认证失败，请重新尝试");
        }
        return R.ok();
    }

    public static void main(String[] args) throws Exception {
        System.out.println(AESUtil.encrypt128("500381199804034737", "Ryo7M3n8loC5"));
    }

    /**