bug修复

huanghongfa

2021-10-09 5e18e81e568db6f9eac73c9d983aea8668dc4f52

bug修复

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java

@@ -156,6 +156,7 @@
                }
                if (StringUtils.isNotEmpty(oneData.get(3))) {
                    vo.setNowAddress(oneData.get(3));
                    vo.setAddress(oneData.get(3));
                }
                if (StringUtils.isEmpty(oneData.get(4))) {
                    index++;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java

@@ -163,6 +163,7 @@
                }
                if (StringUtils.isNotEmpty(oneData.get(3))) {
                    vo.setNowAddress(oneData.get(3));
                    vo.setAddress(oneData.get(3));
                }
                if (StringUtils.isEmpty(oneData.get(4))) {
                    index++;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5779,14 +5779,14 @@
    R timedTaskEldersAuthJobHandler();

    /**
     * 定时任务扫描上月高龄认证使用视频认证的用户添加成功记录
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/elders/auth/record/task")
    R timedTaskEldersAuthRecordJobHandler();

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/elders/authRecords/statistics")

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

@@ -204,7 +204,7 @@
    }

    /**
     * 检测上月所有视频认证记录，取最后一条记录为认证成功记录
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/auth/record/task")
@@ -415,7 +415,7 @@
    }

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/authRecords/statistics")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java

@@ -90,7 +90,7 @@
    R exportElderAuthRecordsStatistic(PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * 身份认证定时任务
     * @return  执行结果
     */
    R timedTaskElderAuthStatisticsJobHandler();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java

@@ -175,7 +175,7 @@
    R timedTaskEldersAuthJobHandler();

    /**
     * 检测上月所有视频认证记录，取最后一条记录为认证成功记录
     * 身份认证定时任务
     * @return  执行结果
     */
    R timedTaskEldersRecordAuthJobHandler();

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

@@ -15,6 +15,8 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -41,17 +43,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.ComElderAuthElderliesDAO;
import com.panzhihua.service_community.dao.ComElderAuthRecordsDAO;
import com.panzhihua.service_community.dao.ComEldersAuthStatisticsMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO;
import com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO;
import com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.service.ComElderAuthRecordsService;

import cn.hutool.core.util.IdcardUtil;
@@ -85,6 +76,14 @@
    private ComActActSignDAO comActActSignDAO;
    @Value("${domain.aesKey:}")
    private String aesKey;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
    @Resource
    private ComPensionAuthHistoryRecordMapper comPensionAuthHistoryRecordMapper;
    @Resource
    private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
    @Resource
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;

    @Override
    public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -334,42 +333,104 @@
        return R.ok(comElderAuthRecordStatisticExcleVOS);
    }

    /**
     * 身份认证定时任务
     * @return  执行结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R timedTaskElderAuthStatisticsJobHandler() {
        Date nowDate = new Date();
        int month = DateUtils.getMonth(nowDate) + 1;
        int year = DateUtils.getYear(nowDate);
        //查询所有启用中社区
        List<ComActDO> actList = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState,0));
        actList.forEach(act -> {
            //高龄认证统计本期应认证人数
            ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = new ComEldersAuthStatisticsDO();
            comEldersAuthStatisticsDO.setCommunityId(act.getCommunityId());
            comEldersAuthStatisticsDO.setMonth(month);
            comEldersAuthStatisticsDO.setYear(year);
            comEldersAuthStatisticsDO.setCreateAt(nowDate);
            List<ComElderAuthElderliesDO> comElderAuthElderliesDOS = comElderAuthElderliesDAO.selectList(new QueryWrapper<ComElderAuthElderliesDO>().lambda()
                    .eq(ComElderAuthElderliesDO::getCommunityId, act.getCommunityId())
                    .eq(ComElderAuthElderliesDO::getIsAlive, 1)
                    .eq(ComElderAuthElderliesDO::getIsRegister, 1));
            if (null != comElderAuthElderliesDOS) {
                comEldersAuthStatisticsDO.setSum(comElderAuthElderliesDOS.size());
        //查询高龄认证记录列表
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                .eq(ComElderAuthRecordsDO::getAuthStatus,ComElderAuthRecordsDO.authStatus.yrz));
        //遍历高龄认证记录列表
        authRecordsList.forEach(authRecords -> {
            if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                        .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authRecords.getElderliesId())
                        .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
                if(authHistoryRecordDO != null){//存在记录
                    if(authHistoryRecordDO.getIsAuth().equals(ComEldersAuthHistoryRecordDO.isAuth.no)){
                        //查询老人信息
                        ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                        if(authElderliesDO != null){
                            BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                            authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                            authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                        }
                        authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                        authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApprovalDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApproverId(authRecords.getApproverId());
                        authHistoryRecordDO.setSubmitUserId(authRecords.getSubmitUserId());
                        authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
                        authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
                        authHistoryRecordDO.setAuthId(authRecords.getId());

                        comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
                    }
                }else{
                    authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                    //查询老人信息
                    ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                    if(authElderliesDO != null){
                        BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                        authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                        authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                    }
                    BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
                    authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
                    authHistoryRecordDO.setMark(null);
                    authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                    authHistoryRecordDO.setAuthId(authRecords.getId());
                    comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
                }
            }
            comEldersAuthStatisticsMapper.insert(comEldersAuthStatisticsDO);
            //上期已认证人数
            String authPeriod = "";
            if (month < 10) {
                authPeriod = String.valueOf(year) + 0 + month;
            } else {
                authPeriod = String.valueOf(year) + month;
        });

        //查询养老认证记录列表
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                .eq(ComPensionAuthRecordDO::getAuthStatus,ComPensionAuthRecordDO.authStatus.rez));
        //遍历养老认证记录列表
        pensionAuthList.forEach(authRecords -> {
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
                    .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authRecords.getPensionerId())
                    .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
            if(pensionAuthDO != null){//存在记录
                if(pensionAuthDO.getIsAuth().equals(ComPensionAuthHistoryRecordDO.isAuth.no)){
                    //查询老人信息
                    ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                    if(authPensionerDO != null){
                        BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                        pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                        pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                    }
                    pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                    pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApprovalDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApproverId(authRecords.getApproverId());
                    pensionAuthDO.setSubmitUserId(authRecords.getSubmitUserId());
                    pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
                    pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
                    pensionAuthDO.setAuthId(authRecords.getId());
                    comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
                }
            }else{
                pensionAuthDO = new ComPensionAuthHistoryRecordDO();
                //查询老人信息
                ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                if(authPensionerDO != null){
                    BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                    pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                    pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                }
                BeanUtils.copyProperties(authRecords,pensionAuthDO);
                pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
                pensionAuthDO.setMark(null);
                pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                pensionAuthDO.setAuthId(authRecords.getId());
                comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
            }
            int authSum = comElderAuthElderliesDAO.haveElderAuthElderliesAmount(act.getCommunityId(), authPeriod);
            ComEldersAuthStatisticsDO comEldersAuthStatisticsDO1 = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>()
                    .lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, act.getCommunityId()).eq(ComEldersAuthStatisticsDO::getYear, year)
                    .eq(ComEldersAuthStatisticsDO::getMonth, month - 1));
            comEldersAuthStatisticsDO1.setAuthSum(authSum);
            comEldersAuthStatisticsDO1.setNoAuthSum(comEldersAuthStatisticsDO1.getSum() - comEldersAuthStatisticsDO1.getAuthSum());
            comEldersAuthStatisticsMapper.updateById(comEldersAuthStatisticsDO1);
        });
        return R.ok();
    }

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

@@ -572,11 +572,11 @@
    }

    /**
     * 检测本月所有认证记录，认证成功记录更新到历史记录中
     * 身份认证定时任务
     * @return  执行结果
     */
    @Override
//    @Transactional(rollbackFor = Exception.class)
    @Transactional(rollbackFor = Exception.class)
    public R timedTaskEldersRecordAuthJobHandler(){
        Date nowDate = new Date();

@@ -621,99 +621,6 @@
                pensionAuthDO.setCreateAt(nowDate);
                pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPension.getIdCard()));
                pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPension.getIdCard()));
                comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
            }
        });

        //查询高龄认证记录列表
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                .eq(ComElderAuthRecordsDO::getAuthStatus,ComElderAuthRecordsDO.authStatus.yrz));
        //遍历高龄认证记录列表
        authRecordsList.forEach(authRecords -> {
            if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                        .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authRecords.getElderliesId())
                        .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
                if(authHistoryRecordDO != null){//存在记录
                    if(authHistoryRecordDO.getIsAuth().equals(ComEldersAuthHistoryRecordDO.isAuth.no)){
                        //查询老人信息
                        ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                        if(authElderliesDO != null){
                            BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                            authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                            authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                        }
                        authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                        authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApprovalDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApproverId(authRecords.getApproverId());
                        authHistoryRecordDO.setSubmitUserId(authRecords.getSubmitUserId());
                        authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
                        authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
                        authHistoryRecordDO.setAuthId(authRecords.getId());

                        comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
                    }
                }else{
                    authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                    //查询老人信息
                    ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                    if(authElderliesDO != null){
                        BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                        authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                        authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                    }
                    BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
                    authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
                    authHistoryRecordDO.setMark(null);
                    authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                    authHistoryRecordDO.setAuthId(authRecords.getId());
                    comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
                }
            }
        });

        //查询养老认证记录列表
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                .eq(ComPensionAuthRecordDO::getAuthStatus,ComPensionAuthRecordDO.authStatus.rez));
        //遍历养老认证记录列表
        pensionAuthList.forEach(authRecords -> {
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
                    .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authRecords.getPensionerId())
                    .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
            if(pensionAuthDO != null){//存在记录
                if(pensionAuthDO.getIsAuth().equals(ComPensionAuthHistoryRecordDO.isAuth.no)){
                    //查询老人信息
                    ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                    if(authPensionerDO != null){
                        BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                        pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                        pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                    }
                    pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                    pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApprovalDate(authRecords.getApprovalDate());
                    pensionAuthDO.setApproverId(authRecords.getApproverId());
                    pensionAuthDO.setSubmitUserId(authRecords.getSubmitUserId());
                    pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
                    pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
                    pensionAuthDO.setAuthId(authRecords.getId());
                    comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
                }
            }else{
                pensionAuthDO = new ComPensionAuthHistoryRecordDO();
                //查询老人信息
                ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                if(authPensionerDO != null){
                    BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                    pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                    pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                }
                BeanUtils.copyProperties(authRecords,pensionAuthDO);
                pensionAuthDO.setAuthDate(authRecords.getApprovalDate());
                pensionAuthDO.setMark(null);
                pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
                pensionAuthDO.setAuthId(authRecords.getId());
                comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
            }
        });

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java

@@ -218,9 +218,12 @@

    @XxlJob("timedTaskEldersAuthJobHandler")
    public ReturnT<String> timedTaskEldersAuthJobHandler(String param) throws Exception {
        log.info("定时任务扫描上月高龄认证使用视频认证的用户添加成功记录");
        log.info("定时任务扫描老人库的老人是否已加入到统计表中");
        R r = communityService.timedTaskEldersAuthRecordJobHandler();
        log.info("执行结果【{}】", r.toString());
        log.info("定时任务扫描老人认证成功记录加入到统计表中");
        R r1 = communityService.timedTaskElderAuthStatisticsJobHandler();
        log.info("执行结果【{}】", r1.toString());
        return ReturnT.SUCCESS;
    }