bug修复

huanghongfa

2021-10-11 fd29b110c6d62ae21fe2b5843cb64f0a08f9143f

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

@@ -17,6 +17,7 @@

import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComElderAuthElderliesService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -84,6 +85,8 @@
    private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
    @Resource
    private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
    @Resource
    private ComElderAuthElderliesService comElderAuthElderliesService;

    @Override
    public R pageElderAuthRecords(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
@@ -150,6 +153,9 @@
        if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) {
            comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz);
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功！");

            authElderliesDO.setAddress(comElderAuthRecordVO.getAddress());
            comElderAuthElderliesDAO.updateById(authElderliesDO);
        } else {
            sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason());
        }
@@ -212,7 +218,10 @@
        List<ComElderAuthRecordsDO> saveList = new ArrayList<>();
        // 需要修改的认证记录集合
        List<ComElderAuthRecordsDO> updateList = new ArrayList<>();
        //需要更新的老人信息
        List<ComElderAuthElderliesDO> updateElderliesList = new ArrayList<>();
        log.info("开始处理导入数据");


        List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
        try {
@@ -272,15 +281,30 @@
                                    }else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) {
                                        comElderAuthRecordsDO = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO,userId,communityId,nowDate);
                                        updateList.add(comElderAuthRecordsDO);

                                        if(StringUtils.isNotEmpty(vo.getAddress())){
                                            comElderAuthElderliesDO.setAddress(vo.getAddress());
                                            updateElderliesList.add(comElderAuthElderliesDO);
                                        }
                                    }else {
                                        // 驳回状态,则新增
                                        comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
                                        saveList.add(comElderAuthRecordsDO);

                                        if(StringUtils.isNotEmpty(vo.getAddress())){
                                            comElderAuthElderliesDO.setAddress(vo.getAddress());
                                            updateElderliesList.add(comElderAuthElderliesDO);
                                        }
                                    }
                                }else {
                                    // 不存在记录,则新增
                                    comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate);
                                    saveList.add(comElderAuthRecordsDO);

                                    if(StringUtils.isNotEmpty(vo.getAddress())){
                                        comElderAuthElderliesDO.setAddress(vo.getAddress());
                                        updateElderliesList.add(comElderAuthElderliesDO);
                                    }
                                }
                            }
                        }
@@ -311,6 +335,9 @@
            comElderAuthRecordsDAO.updateAll(updateList);
            log.info("数据库更新线下认证记录完成");
        }
        if(!updateElderliesList.isEmpty()){
            comElderAuthElderliesService.updateBatchById(updateElderliesList);
        }
        log.info("执行数据库导入完成");

        if (!mistakes.isEmpty()) {