From 3f78e5a92b54cfa64425e73611ae0ac7ba81bc52 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 21 六月 2021 15:45:16 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..aba4278 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,10 @@
package com.panzhihua.service_community.api;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComActDiscussService;
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,6 +18,8 @@
@Resource
private ScreenWorkService screenWorkService;
+ @Resource
+ private ComActDiscussService comActDiscussService;
/**
*
@@ -112,4 +113,14 @@
R workCount(@RequestParam("communityId")Long communityId){
return screenWorkService.workCount(communityId);
}
+
+ /**
+ * 工作大屏-一起议列表
+ * @param discussListDTO 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/getScreenDiscussList")
+ public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
+ return R.ok(comActDiscussService.getScreenDiscussList(discussListDTO));
+ }
}
--
Gitblit v1.7.1