From 0e44c17e08cd13dc24c1e084890b4f2b5c9dac2c Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 22 十月 2021 13:46:05 +0800
Subject: [PATCH] 活动积分优化修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 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 96cbc67..ec5b1c1 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
@@ -1067,10 +1067,12 @@
      *
      * @param userId
      *            用户id
+     * @param status
      * @return 活动列表
      */
     @PostMapping("listactivity")
-    R listActivity(@RequestParam("userId") Long userId);
+    R listActivity(@RequestParam("userId") Long userId,
+                   @RequestParam(value = "status", required = false) Integer status);
 
     /**
      * 用户确认心愿
@@ -2530,12 +2532,12 @@
     /**
      * 批量删除实有人口
      *
-     * @param Ids
+     * @param ids
      *            实有人口id集合
      * @return 删除结果
      */
     @PostMapping("/common/data/population/delete")
-    R deletePopulations(@RequestBody List<Long> Ids);
+    R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);
 
     /**
      * 根据社区id查询所有实有人口
@@ -6980,6 +6982,13 @@
     R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
 
     /**
+     * 实有房屋数据修复定时任务
+     * @return  实有房屋数据修复定时任务
+     */
+    @GetMapping("/population/house/status/task")
+    R timedTaskHouseJobHandler();
+
+    /**
      * 生成二维码
      * @param qrCodeVO
      * @return
@@ -7011,4 +7020,30 @@
      */
     @GetMapping("/activity/regist/list")
     R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);
+
+    /**
+     * 获取活动类型(目前只有志愿者活动需要获取)
+     * @param communityId
+     * @param type
+     * @return
+     */
+    @GetMapping("/activity/type/list")
+    R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+    /**
+     * 添加活动类型
+     * @param comActActivityTypeVO
+     * @return
+     */
+    @PostMapping("/activity/type/add")
+    R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
+
+    /**
+     * 我的评价
+     * @param userId
+     * @param activityId
+     * @return
+     */
+    @GetMapping("/activity/my-evaluate")
+    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
 }

--
Gitblit v1.7.1