From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
index 658841c..62157a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java
@@ -1,11 +1,15 @@
package com.panzhihua.service_community.api;
+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.vos.R;
+import com.panzhihua.service_community.service.ComActActivityService;
+import com.panzhihua.service_community.service.ComActDiscussService;
+import com.panzhihua.service_community.service.ComActMicroWishService;
import com.panzhihua.service_community.service.ScreenWorkService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -19,12 +23,15 @@
@Resource
private ScreenWorkService screenWorkService;
+ @Resource
+ private ComActDiscussService comActDiscussService;
+ @Resource
+ private ComActActivityService comActActivityService;
+ @Resource
+ private ComActMicroWishService comActMicroWishService;
/**
- *
* 大屏统计邻里圈
- * 状态-显示(2)
- * 本月新增-显示(2)
* @param communityId
* @return
*/
@@ -34,10 +41,7 @@
}
/**
- * 大屏统计心愿单，
- * 累计实现-已完成（6）
- * 等待实现-非已完成(1、2、3、4、5)
- * 本月新增-所有状态(1、2、3、4、5、6)
+ * 大屏统计心愿单
* @param communityId
* @return
*/
@@ -48,10 +52,6 @@
/**
* 大屏统计社区活动
- * 状态：报名中（3）、进行中（4）、已结束（5）
- * 本月新增：报名中（3）、进行中（4）、已结束（5）
- * 志愿者活动-参与者人数上限为0
- * 居民活动-参与者人数上限>0
* @param communityId
* @return
*/
@@ -62,7 +62,6 @@
/**
* 大屏统计一起议
- * 参与人数-点赞、评论、评论点赞
* @param communityId
* @return
*/
@@ -73,8 +72,6 @@
/**
* 大屏统计党建工作
- * 党员活动：报名中（3）、进行中（4）、已结束（5）
- * 党员宣传（党员动态）：
* @param communityId
* @return
*/
@@ -85,16 +82,6 @@
/**
* 大屏统计随手拍
- * 新增的-所有状态
- * 已处理-3已驳回 4已完成
- * 已公示-4已完成
- * 未公示-3已驳回
- * 未处理-1待审核
- * 公示比例-已公示/(已公示+已驳回)
- * 平均耗时-创建时间至反馈时间(已完成状态)
- * 线形图-随手拍数量-累计
- * 线形图-新增随手拍-时间段新增
- * 线形图-处理随手拍-时间段（已驳回和已完成）
* @param communityId
* @return
*/
@@ -112,4 +99,40 @@
R workCount(@RequestParam("communityId")Long communityId){
return screenWorkService.workCount(communityId);
}
+
+ /**
+ * 工作大屏-一起议列表
+ * @param discussListDTO 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/getScreenDiscussList")
+ public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
+ return comActDiscussService.getScreenDiscussList(discussListDTO);
+ }
+
+ @PostMapping("/getScreenActActivityList")
+ public R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) {
+ return comActActivityService.getScreenActActivityList(actActivityListDTO);
+ }
+
+ @PostMapping("/getActActivityPeopleList")
+ public R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) {
+ return comActActivityService.getActActivityPeopleList(activityPeopleListDTO);
+ }
+
+ @PostMapping("/getScreenMicroList")
+ public R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO) {
+ return comActMicroWishService.getScreenMicroList(microListDTO);
+ }
+
+ /**
+ * 工作大屏-社区动态模块数据统计
+ * @param communityId 社区id
+ * @return 社区动态数据统计
+ */
+ @GetMapping("/dynamic")
+ public R dynamic(@RequestParam("communityId")Long communityId){
+ return screenWorkService.dynamicWork(communityId);
+ }
+
}
--
Gitblit v1.7.1