From ccff69c44c520fb70ce7e1316a7de8cecaadafd3 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 02 三月 2022 10:51:13 +0800 Subject: [PATCH] 三社功能修改 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 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 fb03956..1f7f01d 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 @@ -24,6 +24,7 @@ import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO; +import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO; import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO; import com.panzhihua.common.model.vos.community.social.*; import io.swagger.annotations.ApiOperation; @@ -1094,7 +1095,7 @@ * @return 活动列表 */ @PostMapping("listactivity") - R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status); + R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type); /** * 用户确认心愿 @@ -8096,4 +8097,56 @@ @GetMapping("/comActRaffle/del") R deleteComActRaffle(@RequestParam("id") Long id); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActRaffleRecord/queryAll") + R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage); + + @GetMapping("/comActRaffleRecord/queryPrize") + R queryPrize(@RequestParam("id")Long id); + + /** + * 生成二维码 + * @param qrCodeVO + * @return + */ + @PostMapping("/comActRaffleRecord/getQRCode") + R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO); + + /** + * 修改数据 + * + * @param comActRaffleRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActRaffleRecord/update") + R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO); + + @PostMapping("/comActRaffleRecord") + R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActRaffleRecord/{id}") + R selectOneRaffleRecord(@PathVariable("id") Long id); + /** + * 导出 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActRaffleRecord/export") + R exportComActRaffleRecord(@RequestBody CommonPage commonPage); + + @GetMapping("/activity/partyMemberCount") + R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year); } -- Gitblit v1.7.1