Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -16,6 +16,8 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComPensionAuthPensionerService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -40,19 +42,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPensionAuthPensionerDAO;
import com.panzhihua.service_community.dao.ComPensionAuthRecordDAO;
import com.panzhihua.service_community.dao.ComPensionAuthStatisticsDAO;
import com.panzhihua.service_community.dao.SysConfMapper;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthPensionerDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthRecordDO;
import com.panzhihua.service_community.model.dos.ComPensionAuthStatisticsDO;
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.ComPensionAuthRecordService;

import cn.hutool.core.util.IdcardUtil;
@@ -88,6 +77,8 @@
    private String aesKey;
    @Resource
    private ComPensionAuthPensionerService comPensionAuthPensionerService;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;

    @Override
    public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -485,16 +476,15 @@
            return R.fail("信息有误,请检查!");
        }
        Date dateNow = new Date();
        String currentAuthPeriod = new SimpleDateFormat("yyyy").format(dateNow);
        List<ComPensionAuthRecordDO> currentAuthPeriodRecords = comPensionAuthRecordDAO
                .selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, currentAuthPeriod)
                        .eq(ComPensionAuthRecordDO::getAuthPeriod, comPensionAuthPensionerDO)
                        .eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId()));
        if (!currentAuthPeriodRecords.isEmpty()) {
            boolean alreadyAuth = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent();
            if (alreadyAuth) {
                return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod));
                return R.fail(String.format("该人员%s期已认证无需重复认证", addIdentityAuthDTO.getAuthPeriod()));
            }
            boolean isPendingReview = currentAuthPeriodRecords.stream()
                    .filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent();
@@ -505,8 +495,8 @@
        ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO();
        BeanUtils.copyProperties(addIdentityAuthDTO, comPensionAuthRecordDO);
        comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
        comPensionAuthRecordDO.setAuthDate(dateNow);
        comPensionAuthRecordDO.setAuthPeriod(currentAuthPeriod);
        comPensionAuthRecordDO.setAuthDate(addIdentityAuthDTO.getAuthTime());
        comPensionAuthRecordDO.setAuthPeriod(addIdentityAuthDTO.getAuthPeriod());
        if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) {
            comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
            comPensionAuthRecordDO.setApprovalDate(dateNow);
@@ -541,4 +531,50 @@
    public R retrievePensionAuthDetail(Long identityAuthId) {
        return R.ok(comPensionAuthRecordDAO.findById(identityAuthId));
    }

    @Override
    public R add(ComElderAuthRecordVO comElderAuthRecordVO) {
        if(!comElderAuthRecordVO.getIdCard().isEmpty()){
            List<ComMngPopulationDO>  comMngPopulationDOS=comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNoStr,comElderAuthRecordVO.getIdCard()).orderByDesc(ComMngPopulationDO::getCreateAt));
            if(!comMngPopulationDOS.isEmpty()){
                ComMngPopulationDO comMngPopulationDO=comMngPopulationDOS.get(0);
                ComPensionAuthPensionerDO comPensionAuthPensionerDO=comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda().eq(ComPensionAuthPensionerDO::getPopulationId,comMngPopulationDO.getId()));
                if(comPensionAuthPensionerDO!=null){
                   Integer count=comPensionAuthRecordDAO.selectCount(new QueryWrapper<ComPensionAuthRecordDO>().lambda().eq(ComPensionAuthRecordDO::getPensionerId,comPensionAuthPensionerDO.getId()).eq(ComPensionAuthRecordDO::getAuthPeriod,comElderAuthRecordVO.getAuthPeriod()));
                   if(count==0){
                       ComPensionAuthRecordDO comPensionAuthRecordDO=new ComPensionAuthRecordDO();
                       BeanUtils.copyProperties(comElderAuthRecordVO,comPensionAuthRecordDO);
                       comPensionAuthRecordDO.setApprovalStatus(PASS_THROUGH.getStatus());
                       comPensionAuthRecordDO.setApprovalDate(new Date());
                       comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
                       comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
                       comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId());
                       comPensionAuthRecordDO.setSubmitUserId(comElderAuthRecordVO.getSubmitUserId());
                       comPensionAuthRecordDO.setApproverId(comElderAuthRecordVO.getSubmitUserId());
                       if (this.baseMapper.insert(comPensionAuthRecordDO) < 0) {
                           return R.fail("认证失败，请重新尝试");
                       }
                       comMngPopulationDO.setPhone(comElderAuthRecordVO.getPhone());
                       comMngPopulationDAO.updateById(comMngPopulationDO);
                       comPensionAuthPensionerDO.setAddress(comElderAuthRecordVO.getAddress());
                       comPensionAuthPensionerDO.setPhone(comElderAuthRecordVO.getPhone());
                       comPensionAuthPensionerDO.setIdCard(null);
                       comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
                       ComElderAuthElderliesDO comElderAuthElderliesDO=comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda().eq(ComElderAuthElderliesDO::getPopulationId,comMngPopulationDO.getId()));
                       if(comElderAuthElderliesDO!=null){
                           comElderAuthElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
                           comElderAuthElderliesDO.setPhone(comElderAuthRecordVO.getPhone());
                           comElderAuthElderliesDO.setIdCard(null);
                           comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
                       }
                       return R.ok();
                   }
                   return R.fail("当前期数已认证，请勿重复认证");
                }
                return R.fail("无养老认证数据");
            }
            return R.fail("该身份证无实有人口信息");
        }
        return R.fail("身份证不能为空");
    }
}