From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +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 | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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 9c6987c..8f8d0ce 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
@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
-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.*;
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;
@@ -123,13 +120,22 @@
R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
- * 活动报名名单
+ * 分页活动报名名单
*
* @param activitySignVO 查询参数
* @return 报名人员集合
*/
@PostMapping("listactivitysign")
R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
/**
* 新增社区动态
@@ -1430,6 +1436,15 @@
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
/**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+ /**
* 社区后台实有单位管理列表
*
* @param pageComMngRealCompanyDTO
@@ -1437,6 +1452,15 @@
*/
@PostMapping("/common/data/company/page")
R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
/**
* 社区后台添加修改实有单位
@@ -3133,11 +3157,11 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- @GetMapping("/screen/getScreenEvent")
- R getScreenEvent(@RequestParam("communityId") Long communityId);
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
@@ -3611,4 +3635,13 @@
*/
@GetMapping("/eventgrid/community/list")
R getCommunityLists();
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
}
--
Gitblit v1.7.1