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 | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 151 insertions(+), 13 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 cc0ebc2..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,10 +24,9 @@
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.social.ComActSocialProjectMemberVO;
-import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
-import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
-import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+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;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
@@ -1096,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);
/**
* 用户确认心愿
@@ -7703,6 +7702,15 @@
@PostMapping("/screen/index/questionnaireList")
R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+ @PostMapping("/screen/hmk/baseInfo")
+ R hmkBaseInfo(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/screen/hmk/partyProjectActivityLine")
+ R partyProjectActivityLine();
+
+ @PostMapping("/screen/hmk/projectActivityTop")
+ R projectActivityProject(@RequestBody CommonPage commonPage);
+
/**
* 通过主键查询单条数据
*
@@ -7711,6 +7719,16 @@
*/
@GetMapping("/comActSocialOrg/{id}")
R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/selectByUserId")
+ R selectOneByUserId(@RequestParam("userId") Long userId);
/**
* 分页查询所有数据
@@ -7740,6 +7758,15 @@
public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);
/**
+ * 批量新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember/batch")
+ public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);
+
+ /**
* 修改数据
*
* @param comActSocialMember 实体对象
@@ -7762,7 +7789,7 @@
* @param comActSocialWorkerAddDTO
* @return 新增结果
*/
- @PostMapping("/comactsocialworker/add")
+ @PostMapping("/comActSocialWorker/add")
R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
/**
@@ -7770,7 +7797,7 @@
* @param comActSocialWorkerEditDTO
* @return 维护结果
*/
- @PostMapping("/comactsocialworker/edit")
+ @PostMapping("/comActSocialWorker/edit")
R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
/**
@@ -7778,7 +7805,7 @@
* @param pageComActSocialWorkerDTO
* @return 维护结果
*/
- @PostMapping("/comactsocialworker/page")
+ @PostMapping("/comActSocialWorker/page")
R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>
/**
@@ -7786,7 +7813,7 @@
* @param comActSocialWorkerDeleteDTO
* @return 平台用户信息
*/
- @PostMapping("/comactsocialworker/delete")
+ @PostMapping("/comActSocialWorker/delete")
R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);
/**
@@ -7794,7 +7821,7 @@
* @param id 社工 id
* @return 查找结果
*/
- @PostMapping("/comactsocialworker/{id}")
+ @PostMapping("/comActSocialWorker/{id}")
R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
/**
@@ -7802,8 +7829,52 @@
*
* @param list 社工集合
*/
- @PostMapping("/comactsocialworker/input")
+ @PostMapping("/comActSocialWorker/input")
R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ *活动查询社工列表
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activity")
+ R activity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 社工查询活动
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activityList")
+ R activityList(@RequestBody CommonPage commonPage);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialWorkerService/queryAll")
+ R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialWorkerService/{id}")
+ R selectOneComActSocialWorkerService(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialWorkerService/update")
+ R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);
+
/**
* 分页查询所有数据
*
@@ -7920,7 +7991,7 @@
* @param id 主键
* @return 单条数据
*/
- @GetMapping("/comActSocialProjectPublicity/{id}")
+ @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
@@ -8009,6 +8080,73 @@
* @param comActColumnVO
* @return
*/
- @PostMapping("/queryLevel")
+ @PostMapping("/comActColumn/queryLevel")
public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);
+
+ @PostMapping("/comActRaffle/queryAll")
+ R selectAllComActRaffle(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffle/detail")
+ R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);
+
+ @PostMapping("/comActRaffle")
+ R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @PostMapping("/comActRaffle/update")
+ R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @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