Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-30 b200b681bc401bb11c133a79273ba78cb6ebedf8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -42,6 +42,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -117,7 +118,7 @@
     * @return 详情
     */
    @PostMapping("detailactivity")
    R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);

    /**
     * 分页活动报名名单
@@ -1442,7 +1443,7 @@
     * @return
     */
    @PostMapping("/common/data/car/export")
    R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
    R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);

    /**
     * 社区后台实有单位管理列表
@@ -3727,4 +3728,116 @@
     */
    @PostMapping("/easyphoto/readUserReward")
    R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/patrolRecord/page")
    R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @PostMapping("/patrolRecord/addPatrolRecord")
    R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 巡查记录详情查询结果
     */
    @PostMapping("/patrolRecord/detail")
    R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);

    /**
     * 分页查询安全工作记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 安全工作记录分页集合
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/page")
    R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据安全工作记录id查询详情
     *
     * @param safetyWorkRecordId 安全工作记录
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/detail")
    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);

    /**
     * 根据巡查记录id查询安全工作记录详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 安全工作记录详情查询结果
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);

    /**
     * 分页查询隐患报告
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 隐患报告分页集合
     */
    @PostMapping("/patrolRecord/dangerReport/page")
    R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 根据隐患报告id查询详情
     *
     * @param dangerReportId 隐患报告id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/patrolRecord/dangerReport/detail")
    R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);

    /**
     * 根据巡查记录id查询隐患报告详情
     *
     * @param patrolRecordId 巡查记录id
     * @return 隐患报告详情查询结果
     */
    @PostMapping("/patrolRecord/dangerReport/detailByPrId")
    R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);

    /**
     * 处理隐患报告
     *
     * @param comSwDangerReportHandleDTO 隐患报告处理参数
     * @return 处理结果
     */
    @PostMapping("/patrolRecord/dangerReport/handle")
    R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);

    /**
     * 整改隐患报告
     *
     * @param comSwDangerReportRectifyDTO 隐患报告整改参数
     * @return 整改结果
     */
    @PostMapping("/patrolRecord/dangerReport/rectify")
    R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);

    /**
     * 隐患报告台账导出
     *
     * @param dangerReportIds
     * @return
     */
    @PostMapping("/patrolRecord/dangerReport/export")
    R exportDangerReport(@RequestBody List<Long> dangerReportIds);

    /**
     * 巡查记录统计接口
     *
     * @return 统计结果
     */
    @PostMapping("/patrolRecord/statistics")
    R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
}