修改bug

huanghongfa

2021-08-02 f8e66c59af77cd44006d044c5719fe5cdd9815e9

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java

@@ -215,6 +215,7 @@
    private Integer displayButton;

    @ApiModelProperty("隐患/安全记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long serviceId;

    /**

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

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