1123死亡管理相关功能提交

101captain

2021-11-23 ee76243fba9dff499945fad6975d295e1558af2c

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

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

import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
import com.panzhihua.service_community.dao.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -60,6 +61,9 @@

    @Resource
    private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;

    @Resource
    private ComActDAO comActDAO;

    @Override
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
@@ -254,8 +258,10 @@
                .eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
            if (comSwPatrolRecordVO.getIsHiddenDanger().equals(ComSwPatrolRecordVO.isOk.yes)) {
                if (null != comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
                ComSwDangerReportDO comSwDangerReportDO=comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId());
                if (null != comSwDangerReportDO) {
                    comSwPatrolRecordVO.setDisplayButton(3);
                    comSwPatrolRecordVO.setDagerNo(comSwDangerReportDO.getDangerNo());
                } else {
                    comSwPatrolRecordVO.setDisplayButton(2);
                }
@@ -304,6 +310,8 @@
        if (comSwPatrolRecordVO.getCreateBy() != null) {
            comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
        }
        // 所属社区名称
        comSwPatrolRecordVO.setCommunityName(comActDAO.selectById(comSwPatrolRecordVO.getCommunityId()).getName());

        ComSwPatrolRecordReportDO recordReportDO =
            comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda()