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/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
index 5be004c..80835c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -3,6 +3,7 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordStatisticsVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.service.ComSwDangerReportService;
import com.panzhihua.service_community.service.ComSwPatrolRecordService;
@@ -189,6 +190,16 @@
}
/**
+ * 根据id查询值班表
+ * @param rotaId 值班表id
+ * @return 值班表详情
+ */
+ @GetMapping("/rota/detail")
+ public R detailRota(@RequestParam("rotaId") Long rotaId){
+ return comSwRotaService.detailRota(rotaId);
+ }
+
+ /**
* 新增值班表
* @param comSwRotaSaveDTOs 新增参数
* @return 新增结果
@@ -225,5 +236,15 @@
public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
return comSwRotaService.getRotaLeaderByDate(rotaDate);
}
+
+ /**
+ * 批量导入值班表
+ *
+ * @param list 值班表集合
+ */
+ @PostMapping("/rota/import")
+ public R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId){
+ return comSwRotaService.listSaveSwRotaExcelVO(list, communityId);
+ }
}
--
Gitblit v1.7.1