From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +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 | 165 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 64 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 f9533ae..92bc752 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,12 +1067,10 @@
*
* @param userId
* 用户id
- * @param status
* @return 活动列表
*/
@PostMapping("listactivity")
- R listActivity(@RequestParam("userId") Long userId,
- @RequestParam(value = "status", required = false) Integer status);
+ R listActivity(@RequestParam("userId") Long userId);
/**
* 用户确认心愿
@@ -2500,6 +2498,12 @@
R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
/**
+ * 根据身份证查询实有人口信息
+ */
+ @GetMapping("/common/data/population/selectByIdCard")
+ R selectByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
* 根据id实有人口详细信息
*
* @param populationId
@@ -3838,6 +3842,15 @@
R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);
/**
+ * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/export")
+ R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
* 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
* @param pageElderAuthRecordsDTO 查询参数
* @return R 查询结果
@@ -4577,14 +4590,6 @@
R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
/**
- * 综治app-小区列表
- * @param villageListAppDTO 请求参数
- * @return 小区列表
- */
- @PostMapping("/village/grid/list/app")
- R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
-
- /**
* 综治app-根据小区id查询小区下楼栋列表
*
* @param villageId
@@ -4925,6 +4930,22 @@
*/
@GetMapping("/eventgrid/community/list")
R getCommunityLists();
+
+ /**
+ * 查询西区社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/westList")
+ R getWestCommunityLists();
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
/**
* 分页查询退役军人列表
@@ -5681,11 +5702,12 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
- * @return 登记明细数据
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return 登记明细数据
*/
- @GetMapping("/reserve/admin/register/list/export")
- R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
+ @PostMapping("/reserve/admin/register/list/export")
+ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
/**
* 查询预约登记题目列表
@@ -6990,13 +7012,6 @@
R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
/**
- * 实有房屋数据修复定时任务
- * @return 实有房屋数据修复定时任务
- */
- @GetMapping("/population/house/status/task")
- R timedTaskHouseJobHandler();
-
- /**
* 生成二维码
* @param qrCodeVO
* @return
@@ -7013,53 +7028,16 @@
public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
/**
- * 活动报名签到情况
- * @param id 活动主键id
- * @return
+ * 实有房屋数据修复定时任务
+ * @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);
+ @GetMapping("/population/house/status/task")
+ R timedTaskHouseJobHandler();
/**
* 导出特殊群体
*
- * @param pageInputUserDTO
- * 请求参数
+ * @param pageInputUserDTO 请求参数
* @return 特殊群体列表
*/
@PostMapping("common/data/special/export")
@@ -7155,4 +7133,63 @@
@GetMapping("/comActColumn/del")
R comActColumnDelete(@RequestParam("id") Long id);
+ /**
+ * 高龄认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/authRecord/add")
+ R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 养老认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/pensionAuthRecord/add")
+ R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+ /**
+ * 活动报名签到情况
+ * @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);
}
--
Gitblit v1.7.1