Merge remote-tracking branch 'origin/test' into test

manailin

2021-10-08 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd

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

@@ -585,7 +585,7 @@
        String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();

        //查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
        List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
        List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(null);
        authElderliesList.forEach(authElderlies -> {
            //查询高龄认证记录
            ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
@@ -603,7 +603,7 @@
        });

        //查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
        List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(new QueryWrapper<>());
        List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.selectList(null);
        pensionAuthPensionerList.forEach(authPension -> {
            //查询养老认证记录
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
@@ -621,8 +621,7 @@
        });

        //查询高龄认证记录列表
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                .ge(ComElderAuthRecordsDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(null);
        //遍历高龄认证记录列表
        authRecordsList.forEach(authRecords -> {
            if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
@@ -639,6 +638,12 @@
                        authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
                        authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
                        authHistoryRecordDO.setAuthId(authRecords.getId());

                        //查询老人信息
                        ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                        if(authElderliesDO != null){
                            BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                        }
                        comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
                    }
                }else{
@@ -657,8 +662,7 @@
        });

        //查询养老认证记录列表
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda()
                .ge(ComPensionAuthRecordDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
        List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(null);
        //遍历养老认证记录列表
        pensionAuthList.forEach(authRecords -> {
            ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
@@ -674,6 +678,11 @@
                    pensionAuthDO.setAuthMethod(authRecords.getAuthMethod());
                    pensionAuthDO.setVerificationResult(authRecords.getVerificationResult());
                    pensionAuthDO.setAuthId(authRecords.getId());
                    //查询老人信息
                    ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                    if(authPensionerDO != null){
                        BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                    }
                    comPensionAuthHistoryRecordMapper.updateById(pensionAuthDO);
                }
            }else{