Merge branch 'test_bak' into 'master'

罗元桥

2021-10-09 4082af9f2275d501cd47a8a63e34cb266a2fbfd4

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

@@ -354,8 +354,10 @@
                        //查询老人信息
                        ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                        if(authElderliesDO != null){
                            Long authId = authHistoryRecordDO.getId();
                            BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                            authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                            authHistoryRecordDO.setId(authId);
                            authHistoryRecordDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authElderliesDO.getIdCard()),DateUtils.yyyyMMdd_format));
                            authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                        }
                        authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
@@ -375,7 +377,7 @@
                    ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(authRecords.getElderliesId());
                    if(authElderliesDO != null){
                        BeanUtils.copyProperties(authElderliesDO,authHistoryRecordDO);
                        authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderliesDO.getIdCard()));
                        authHistoryRecordDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authElderliesDO.getIdCard()),DateUtils.yyyyMMdd_format));
                        authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderliesDO.getIdCard()));
                    }
                    BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
@@ -401,8 +403,10 @@
                    //查询老人信息
                    ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                    if(authPensionerDO != null){
                        Long authId = pensionAuthDO.getId();
                        BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                        pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                        pensionAuthDO.setId(authId);
                        pensionAuthDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authPensionerDO.getIdCard()),DateUtils.yyyyMMdd_format));
                        pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                    }
                    pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.yes);
@@ -421,7 +425,7 @@
                ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(authRecords.getPensionerId());
                if(authPensionerDO != null){
                    BeanUtils.copyProperties(authPensionerDO,pensionAuthDO);
                    pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPensionerDO.getIdCard()));
                    pensionAuthDO.setBrithday(DateUtils.format(IdcardUtil.getBirthDate(authPensionerDO.getIdCard()),DateUtils.yyyyMMdd_format));
                    pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPensionerDO.getIdCard()));
                }
                BeanUtils.copyProperties(authRecords,pensionAuthDO);