Merge branch 'test' into 'master'

罗元桥

2021-09-13 e4c64bf1edc05a164406778e9cfaa86744210d05

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

@@ -1,10 +1,13 @@
package com.panzhihua.service_community.service.impl;

import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -121,6 +124,54 @@
    }

    @Override
    public R editDangerReport(ComSwDangerReportEditDTO comSwDangerReportEditDTO) {
        ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(comSwDangerReportEditDTO.getId());
        if (null == comSwDangerReportDO) {
            return R.fail("该隐患报告不存在");
        }
        BeanUtils.copyProperties(comSwDangerReportEditDTO, comSwDangerReportDO);
        comSwDangerReportDO.setDangerType(comSwDangerReportEditDTO.getPatrolType());
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
                .lambda().eq(ComSwPatrolRecordReportDO::getReportId, comSwDangerReportEditDTO.getId()));
        ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO();
        if (null != comSwPatrolRecordReportDO) {
            comSwPatrolRecordDO = comSwPatrolRecordDAO.selectOne(new QueryWrapper<ComSwPatrolRecordDO>()
                    .lambda().eq(ComSwPatrolRecordDO::getId, comSwPatrolRecordReportDO.getPatrolRecordId()));
            Long id = comSwPatrolRecordDO.getId();
            BeanUtils.copyProperties(comSwDangerReportEditDTO, comSwPatrolRecordDO);
            comSwPatrolRecordDO.setId(id);
            try {
                comSwPatrolRecordDO.setPatrolTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwDangerReportEditDTO.getPatrolTime()));
                comSwPatrolRecordDO.setSuccessionTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwDangerReportEditDTO.getSuccessionTime()));
            } catch (Exception e) {
                e.printStackTrace();
            }
            // 根据传递的巡查人员id查询巡查人员的名字和电话
            StringBuilder nameString = new StringBuilder();
            StringBuilder phoneString = new StringBuilder();
            if (StringUtils.isNotEmpty(comSwDangerReportEditDTO.getPatrolPerson())) {
                String[] personIds = comSwDangerReportEditDTO.getPatrolPerson().split(",");
                for (int i = 0; i < personIds.length; i++) {
                    Map<String, String> person = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                    if (person != null) {
                        if (i != 0) {
                            nameString.append(",");
                            phoneString.append(",");
                        }
                        nameString.append(person.get("name"));
                        phoneString.append(person.get("phone"));
                    }
                }
                comSwPatrolRecordDO.setPersonName(nameString.toString());
                comSwPatrolRecordDO.setPersonPhone(phoneString.toString());
            }
        }
        comSwPatrolRecordDAO.updateById(comSwPatrolRecordDO);
        comSwDangerReportDAO.updateById(comSwDangerReportDO);
        return R.ok();
    }

    @Override
    public R detailDangerReport(Long dangerReportId) {
        ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectById(dangerReportId);
        if (null == comSwDangerReportDO) {
@@ -134,6 +185,7 @@
            ComSwPatrolRecordDO comSwPatrolRecordDO =
                comSwPatrolRecordDAO.selectById(comSwPatrolRecordReportDO.getPatrolRecordId());
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwDangerReportVO);
            comSwDangerReportVO.setPatrolTime(new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordDO.getPatrolTime()));
        }
        BeanUtils.copyProperties(comSwDangerReportDO, comSwDangerReportVO);