Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-05 d769a8683ea6f2ecbc451da71ca3079c6765a99d

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

@@ -51,7 +51,28 @@

    @Override
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        //是否是查询自己的巡查记录
        if(StringUtils.isNotEmpty(comSwPatrolRecordPageDTO.getPatrolPerson())){
            Map<String,Object> map = comSwPatrolRecordDAO.getPbServiceTeamCardNo(comSwPatrolRecordPageDTO.getPatrolPerson());
            if(map != null){
                comSwPatrolRecordPageDTO.setPatrolPerson(map.get("id").toString());
            }
        }
        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO);
        if(!iPage.getRecords().isEmpty()){
            iPage.getRecords().forEach(patrol -> {
                ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
                        .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,patrol.getId()));
                if(recordReportDO != null){
                    patrol.setServiceId(recordReportDO.getReportId());
                    if (null != comSwDangerReportDAO.selectById(recordReportDO.getReportId())) {
                        patrol.setDangerOrRecord(1);
                    }else{
                        patrol.setDangerOrRecord(2);
                    }
                }
            });
        }
        return R.ok(iPage);
    }

@@ -103,6 +124,7 @@
                comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode()));
            }
            BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO);
            comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription());
            comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName());
            comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone());
            comSwDangerReportDAO.insert(comSwDangerReportDO);
@@ -180,6 +202,12 @@
        if(comSwPatrolRecordVO.getCreateBy() != null){
            comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
        }

        ComSwPatrolRecordReportDO recordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>()
                .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,comSwPatrolRecordVO.getId()));
        if(recordReportDO != null){
            comSwPatrolRecordVO.setServiceId(recordReportDO.getReportId());
        }
        return R.ok(comSwPatrolRecordVO);
    }