From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 1 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 8080d70..f9533ae 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);
/**
* 用户确认心愿
@@ -4575,6 +4577,14 @@
R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
/**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
* 综治app-根据小区id查询小区下楼栋列表
*
* @param villageId
@@ -6978,4 +6988,171 @@
*/
@PostMapping("/comActWarehouseDonates/donates/apply")
R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
+
+ /**
+ * 实有房屋数据修复定时任务
+ * @return 实有房屋数据修复定时任务
+ */
+ @GetMapping("/population/house/status/task")
+ R timedTaskHouseJobHandler();
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 活动报名签到情况
+ * @param id 活动主键id
+ * @return
+ */
+ @GetMapping("/activity/sign-in/list")
+ R listSignInRecord(@RequestParam("id") Long id);
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ @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);
+
+ /**
+ * 导出特殊群体
+ *
+ * @param pageInputUserDTO
+ * 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("common/data/special/export")
+ R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAnnouncement/queryAll")
+ R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAnnouncement/{id}")
+ R comActAnnouncementSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAnnouncement")
+ R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAnnouncement/update")
+ R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAnnouncement/del")
+ R comActAnnouncementDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActColumn/queryAll")
+ R comActColumnSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActColumn/{id}")
+ R comActColumnSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumn 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActColumn")
+ R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumn 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActColumn/update")
+ R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActColumn/del")
+ R comActColumnDelete(@RequestParam("id") Long id);
+
}
--
Gitblit v1.7.1