Merge branch 'test' into 'zzj'

罗元桥

2021-09-16 5dc04f3291c00d66f8733a49896612ea1e3b31c5

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

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

import javax.annotation.Resource;

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

@@ -165,6 +166,62 @@
    }

    @Override
    public R editPatrolRecord(ComSwPatrolRecordEditDTO comSwPatrolRecordEditDTO) {
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(comSwPatrolRecordEditDTO.getId());
        if (null == comSwPatrolRecordDO) {
            return R.fail("改巡查记录不存在");
        }
        BeanUtils.copyProperties(comSwPatrolRecordEditDTO, comSwPatrolRecordDO);
        try {
            comSwPatrolRecordDO.setPatrolTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwPatrolRecordEditDTO.getPatrolTime()));
            comSwPatrolRecordDO.setSuccessionTime(new SimpleDateFormat("yyyy-MM-dd").parse(comSwPatrolRecordEditDTO.getSuccessionTime()));
        } catch (Exception e) {
            e.printStackTrace();
        }
        // 根据传递的巡查人员id查询巡查人员的名字和电话
        StringBuilder nameString = new StringBuilder();
        StringBuilder phoneString = new StringBuilder();
        if (StringUtils.isNotEmpty(comSwPatrolRecordEditDTO.getPatrolPerson())) {
            String[] personIds = comSwPatrolRecordEditDTO.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());
        }
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
                .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, comSwPatrolRecordEditDTO.getId()));
        ComSwSafetyWorkRecordDO comSwSafetyWorkRecordDO = comSwSafetyWorkRecordDAO.selectOne(new QueryWrapper<ComSwSafetyWorkRecordDO>()
                .lambda().eq(ComSwSafetyWorkRecordDO::getId, comSwPatrolRecordReportDO.getReportId()));
        if (null != comSwSafetyWorkRecordDO) {
            Long id = comSwSafetyWorkRecordDO.getId();
            BeanUtils.copyProperties(comSwPatrolRecordEditDTO, comSwSafetyWorkRecordDO);
            comSwSafetyWorkRecordDO.setId(id);
            comSwSafetyWorkRecordDAO.updateById(comSwSafetyWorkRecordDO);
        }else {
            ComSwDangerReportDO comSwDangerReportDO = comSwDangerReportDAO.selectOne(new QueryWrapper<ComSwDangerReportDO>()
                    .lambda().eq(ComSwDangerReportDO::getId, comSwPatrolRecordReportDO.getReportId()));
            Long id = comSwDangerReportDO.getId();
            BeanUtils.copyProperties(comSwPatrolRecordEditDTO, comSwDangerReportDO);
            comSwDangerReportDO.setId(id);
            comSwDangerReportDAO.updateById(comSwDangerReportDO);
        }
        int update = comSwPatrolRecordDAO.updateById(comSwPatrolRecordDO);
        if (update > 0) {
            return R.ok();
        }
        return R.fail("编辑失败");
    }

    @Override
    public R detailPatrolRecord(Long patrolRecordId) {
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        if (null == comSwPatrolRecordDO) {