发送钉钉修改

sinake

2 天以前 a19fd2396876e21fdc2ba2f4d5e60755f116132d

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceRelativesconfirmationServiceImpl.java

@@ -26,6 +26,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

import com.ruoyi.common.utils.StringUtils;
@@ -221,6 +222,23 @@
            relativeConfirmationVO.setReporterno(user.getUserName());
        }
        List<RelativeConfirmationVO> relativeConfirmationVOS = serviceRelativesconfirmationMapper.selectVOList(relativeConfirmationVO);

        // 一次性取出各捐献基础对应的死亡时间，避免在循环里按 InfoID 逐条查见证表（N+1）
        List<Long> infoIds = new ArrayList<>();
        for (RelativeConfirmationVO item : relativeConfirmationVOS) {
            if (item.getInfoid() != null) {
                infoIds.add(item.getInfoid());
            }
        }
        Map<Long, Date> deathTimeMap = new HashMap<>();
        if (!infoIds.isEmpty()) {
            for (ServiceDonationwitness witness : serviceDonationwitnessMapper.selectDeathTimeByInfoIds(infoIds)) {
                if (witness.getInfoid() != null && !deathTimeMap.containsKey(witness.getInfoid())) {
                    deathTimeMap.put(witness.getInfoid(), witness.getDeathtime());
                }
            }
        }

        for (RelativeConfirmationVO relativeConfirmationVO1 : relativeConfirmationVOS) {
            //先给个年龄默认值（因为age是数字类型，不能放横杠，所以就所横扛放到单位上）
            relativeConfirmationVO1.setAgeunit("-");
@@ -228,22 +246,17 @@
            relativeConfirmationVO1.setAge2(null);

            //获取死亡时间，如果获取见证里有死亡时间，则进行计算他的年龄
            ServiceDonationwitness sdw = new ServiceDonationwitness();
            sdw.setInfoid(relativeConfirmationVO1.getInfoid());
            List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
            if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && relativeConfirmationVO1.getBirthday() != null) {
                Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
                if (ObjectUtils.isNotEmpty(deathtime)) {
                    Map<String, String> map = CalculateDateUtils.calculateAge(relativeConfirmationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                    if (ObjectUtils.isEmpty(map)) {
                        log.error("RelativeConfirmationVO出生日期：{},RelativeConfirmationVO死亡日期：{}", relativeConfirmationVO1.getBirthday(), deathtime);
                        continue;
                    }
                    relativeConfirmationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                    relativeConfirmationVO1.setAgeunit(map.get("ageUnit"));
                    relativeConfirmationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                    relativeConfirmationVO1.setAgeunit2(map.get("ageUnit2"));
            Date deathtime = deathTimeMap.get(relativeConfirmationVO1.getInfoid());
            if (ObjectUtils.isNotEmpty(deathtime) && relativeConfirmationVO1.getBirthday() != null) {
                Map<String, String> map = CalculateDateUtils.calculateAge(relativeConfirmationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                if (ObjectUtils.isEmpty(map)) {
                    log.error("RelativeConfirmationVO出生日期：{},RelativeConfirmationVO死亡日期：{}", relativeConfirmationVO1.getBirthday(), deathtime);
                    continue;
                }
                relativeConfirmationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                relativeConfirmationVO1.setAgeunit(map.get("ageUnit"));
                relativeConfirmationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                relativeConfirmationVO1.setAgeunit2(map.get("ageUnit2"));
            }
        }
        return relativeConfirmationVOS;