From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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 ded5923..ed5a867 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
@@ -9,6 +9,11 @@
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -42,7 +47,6 @@
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 com.panzhihua.common.utlis.ExcelSelectObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -2867,10 +2871,17 @@
*/
@PostMapping("/elders/records/page")
R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
-
+ /**
+ * description 批量保存重点人群人员信息
+ *
+ * @param list 重点人群信息
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
@PostMapping("/key_person/batch/save")
R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
-
+
@GetMapping("/screen/population/statistic")
R statistic(@RequestParam("communityId")Long communityId);
@@ -2888,7 +2899,7 @@
@PostMapping("/elders/getAuthHistoryExport")
R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
-
+
@GetMapping("/screen/work/neighborCircle")
R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
@@ -2951,7 +2962,7 @@
*/
@GetMapping("/screen/getScreenCivil")
R getScreenCivil(@RequestParam("communityId")Long communityId);
-
+
/**
* 大屏统计邻里圈
*/
@@ -2998,7 +3009,7 @@
*/
@GetMapping("/screen/work/workCount")
R workCount(@RequestParam("communityId")Long communityId);
-
+
/**
* description 批量保存残疾人人员信息
*
@@ -3025,4 +3036,37 @@
*/
@PostMapping("/screen/getScreenEventDetail")
R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 工作大屏-一起议列表
+ * @param discussListDTO 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/screen/work/getScreenDiscussList")
+ R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+ /**
+ * 工作大屏-社区活动列表
+ * @param actActivityListDTO 请求参数
+ * @return 活动列表
+ */
+ @PostMapping("/screen/work/getScreenActActivityList")
+ R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+ /**
+ * 工作大屏-社区活动报名人员列表
+ * @param activityPeopleListDTO 请求参数
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/screen/work/getActActivityPeopleList")
+ R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+ /**
+ * 工作大屏-微心愿列表
+ * @param microListDTO 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("/screen/work/getScreenMicroList")
+ R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+
}
--
Gitblit v1.7.1