Merge branch 'test' into 'test_bak'

罗元桥

2021-10-12 ac40c3007b59a73c6ad985d8fab2a6d0db65af87

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

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

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.service.ComPensionAuthPensionerService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -85,6 +86,8 @@
    private ComActActSignDAO comActActSignDAO;
    @Value("${domain.aesKey:}")
    private String aesKey;
    @Resource
    private ComPensionAuthPensionerService comPensionAuthPensionerService;

    @Override
    public R pagePensionAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -135,10 +138,19 @@
        if (comPensionAuthRecordDO == null) {
            return R.fail("未查询到养老认证记录");
        }

        ComPensionAuthPensionerDO authPensionerDO = comPensionAuthPensionerDAO.selectById(comPensionAuthRecordDO.getPensionerId());
        if(authPensionerDO == null){
            return R.fail("未查询到老人信息");
        }

        BeanUtils.copyProperties(comPensionAuthRecordVO, comPensionAuthRecordDO);
        if (comPensionAuthRecordVO.getApprovalStatus().equals(PASS_THROUGH.getStatus())) {
            comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", "认证成功！");

            authPensionerDO.setAddress(comPensionAuthRecordVO.getAddress());
            comPensionAuthPensionerDAO.updateById(authPensionerDO);
        } else {
            sendAuthSubscribe(comPensionAuthRecordDO.getSubmitUserId(), "养老认证", comPensionAuthRecordVO.getRejectReason());
        }
@@ -194,6 +206,8 @@
        List<ComPensionAuthRecordDO> saveList = new ArrayList<>();
        // 需要修改的认证记录集合
        List<ComPensionAuthRecordDO> updateList = new ArrayList<>();
        // 需要更新的老人信息
        List<ComPensionAuthPensionerDO> updatePensionerList = new ArrayList<>();
        log.info("开始处理导入数据");
        Date nowDate = new Date();
        List<ComPensionAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
@@ -253,15 +267,30 @@
                                    //存在待审核记录，进行更新认证信息
                                    comPensionAuthRecordDO = updatePensionAuthRecordsDO(vo, comPensionAuthRecordDO, userId,communityId,nowDate);
                                    updateList.add(comPensionAuthRecordDO);

                                    if(StringUtils.isNotEmpty(vo.getAddress())){
                                        comPensionAuthPensionerDO.setAddress(vo.getAddress());
                                        updatePensionerList.add(comPensionAuthPensionerDO);
                                    }
                                }else {
                                    // 不存在记录,则新增
                                    comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
                                    saveList.add(comPensionAuthRecordDO);

                                    if(StringUtils.isNotEmpty(vo.getAddress())){
                                        comPensionAuthPensionerDO.setAddress(vo.getAddress());
                                        updatePensionerList.add(comPensionAuthPensionerDO);
                                    }
                                }
                            }else {
                                // 不存在记录,则新增
                                comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
                                saveList.add(comPensionAuthRecordDO);

                                if(StringUtils.isNotEmpty(vo.getAddress())){
                                    comPensionAuthPensionerDO.setAddress(vo.getAddress());
                                    updatePensionerList.add(comPensionAuthPensionerDO);
                                }
                            }
                        }
                    }
@@ -291,6 +320,9 @@
            comPensionAuthRecordDAO.updateAll(updateList);
            log.info("数据库更新线下认证记录完成");
        }
        if(!updatePensionerList.isEmpty()){
            comPensionAuthPensionerService.updateBatchById(updatePensionerList);
        }
        log.info("执行数据库导入完成");

        if (!mistakes.isEmpty()) {