值班表导入bug修改

tangxiaobao

2021-08-04 aa76c2b0bb73e9fe463387fb5656ea80094eceec

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

@@ -51,6 +51,13 @@

    @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 -> {
@@ -189,6 +196,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);
    }