From 6c0af7790f972e8a186a88d67e408498903d9eeb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 4655aee..cff8933 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/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);
+
 }

--
Gitblit v1.7.1