From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 5 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 d8e7446..7ee14de 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
@@ -14,6 +14,11 @@
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
@@ -3643,9 +3648,8 @@
/**
* 社区随手拍列表统计
- *
- * @param communityId 社区id
- * @return 统计结果
+ * @param communityId 社区id
+ * @return 统计结果
*/
@GetMapping("/easyphoto/statistics")
R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
@@ -3819,7 +3823,7 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detail")
- R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
+ R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 根据巡查记录id查询安全工作记录详情
@@ -3828,7 +3832,7 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
- R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+ R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 分页查询隐患报告
@@ -3893,6 +3897,86 @@
R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
/**
+ * 小程序-查询积分说明
+ * @return 积分说明
+ */
+ @GetMapping("/integral/explain/applets")
+ R getIntegralExplainApplets();
+
+ /**
+ * 小程序-用户查询当前社区可领取积分规则列表
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 可领取积分规则列表
+ */
+ @PostMapping("/integral/receive/applets")
+ R getIntegralReceiveApplets(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-查询用户积分列表
+ * @param userId 用户id
+ * @return 用户积分列表
+ */
+ @PostMapping("/integral/user/list/applets")
+ R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-查询社区积分账户排行榜
+ * @param communityRankDTO 请求参数
+ * @return 社区积分账户排行榜
+ */
+ @PostMapping("/integral/community/rank/applets")
+ R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO);
+
+ /**
+ * 小程序-查询用户社区积分明细
+ * @param communityTradeDTO 请求参数
+ * @return 用户社区积分明细
+ */
+ @PostMapping("/integral/community/trade/applets")
+ R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO);
+
+ /**
+ * 社区后台-根据社区id查询社区下积分规则列表
+ * @param integralRuleDTO 请求参数
+ * @return 社区下积分规则列表
+ */
+ @PostMapping("/integral/rule/list/admin")
+ R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-编辑社区积分规则
+ * @param integralRuleDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/integral/rule/edit/admin")
+ R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-分页查询社区下积分明细记录
+ * @param integralRuleDTO 请求参数
+ * @return 社区下积分明细记录
+ */
+ @PostMapping("/integral/user/trade/page/admin")
+ R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO);
+
+ /**
+ * 给用户添加积分
+ * @param integralUserDTO 请求参数
+ * @return 添加积分结果
+ */
+ @PostMapping("/integral/user/add/admin")
+ R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
+
+ /**
+ * 根据社区活动id查询社区活动报名人员列表
+ * @param activityId 活动id
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/integral/act/activity/admin")
+ R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
+
+ /**
* 分页查询值班表
*
* @param comSwRotaPageDTO 查询参数
@@ -3900,6 +3984,14 @@
*/
@PostMapping("/patrolRecord/rota/page")
R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);
+
+ /**
+ * 根据id查询值班表
+ * @param rotaId 值班表id
+ * @return 值班表详情
+ */
+ @GetMapping("/patrolRecord/rota/detail")
+ R detailRota(@RequestParam("rotaId") Long rotaId);
/**
* 新增值班表
@@ -3934,4 +4026,12 @@
@GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
+ /**
+ * 批量导入值班表
+ *
+ * @param list 值班表集合
+ */
+ @PostMapping("/patrolRecord/rota/import")
+ R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);
+
}
--
Gitblit v1.7.1