Merge branch 'test' into 'master'

罗元桥

2021-07-31 ae84b84b6a1bf77f112ac01c858899be60d89300

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

@@ -3986,6 +3986,14 @@
    R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);

    /**
     * 根据id查询值班表
     * @param rotaId 值班表id
     * @return 值班表详情
     */
    @GetMapping("/patrolRecord/rota/detail")
    R detailRota(@RequestParam("rotaId") Long rotaId);

    /**
     * 新增值班表
     *
     * @param comSwRotaSaveDTOs 新增参数
@@ -4018,4 +4026,12 @@
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);

    /**
     * 批量导入值班表
     *
     * @param list 值班表集合
     */
    @PostMapping("/patrolRecord/rota/import")
    R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);

}