Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwDangerReportDAO.java

@@ -1,18 +1,17 @@
package com.panzhihua.service_community.dao;

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwDangerReportExcelVO;
import com.panzhihua.common.model.vos.community.ComSwDangerReportVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther txb
@@ -24,15 +23,19 @@

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * 
     * @param comSwPatrolRecordPageDTO
     *            查询参数
     * @return 隐患报告分页集合
     */
    IPage<ComSwDangerReportVO> pageDangerReport(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
    IPage<ComSwDangerReportVO> pageDangerReport(Page page,
        @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @param dangerReportId
     *            隐患报告id
     * @return 隐患报告详情查询结果
     */
    ComSwDangerReportVO detailDangerReport(@Param("dangerReportId") Long dangerReportId);
@@ -40,7 +43,8 @@
    /**
     * 根据隐患报告id批量查询详情
     *
     * @param dangerReportIds 隐患报告ids
     * @param dangerReportIds
     *            隐患报告ids
     * @return
     */
    List<ComSwDangerReportExcelVO> exportDangerReport(@Param("dangerReportIds") List<Long> dangerReportIds);