From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index b3cf9a5..6dd8a16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -2445,6 +2446,10 @@
return comActEasyPhotoService.getUserReward(userId, communityId);
}
+ @PostMapping("easyphoto/getUserRewardsNew")
+ public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.getUserRewardNew(userId, communityId);
+ }
/**
* 读取用户随手拍奖励
*
@@ -2767,4 +2772,45 @@
return automessageSysUserService.selectAutomessageSysUserById(id);
}
+ /**
+ * 根据id查询重复的社区id集合
+ * @return
+ */
+ @GetMapping("selectBasicData")
+ public R selectBasicData(){
+ return comActService.selectBasicData();
+ }
+
+ /**
+ * 统计在职干部特长
+ * @return
+ */
+ @GetMapping("statisticsPbMemberType")
+ public R statisticsPbMemberType(){
+ return comActService.statisticsPbMemberType();
+ }
+
+ /**
+ * 统计单位
+ * @return
+ */
+ @GetMapping("selectUnitByNatureName")
+ public R selectUnitByNatureName(){
+ return comActService.selectUnitByNatureName();
+ }
+
+ /**
+ * 大屏-社区活动分页
+ * @return
+ */
+ @PostMapping("pageActivityBigScreen")
+ public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
+ return comActActivityService.pageActivityBigScreen(pageBaseDTO);
+ }
+
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ public R selectStatisticsPhoto() {
+ return comActEasyPhotoService.selectStatisticsPhoto();
+ }
+
}
--
Gitblit v1.7.1