From c9ad444d7d6b113b5f933e3f4f288b760207539d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 28 十二月 2021 14:40:49 +0800
Subject: [PATCH] 12/28 项目分类相关功能修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 205 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 196 insertions(+), 9 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 880a211..2ec1117 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
@@ -1,8 +1,30 @@
package com.panzhihua.common.service.community;
+import java.io.Serializable;
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.building.admin.*;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.*;
+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 io.swagger.annotations.ApiOperation;
+import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -237,15 +259,11 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.DictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
@@ -300,6 +318,7 @@
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -1071,7 +1090,7 @@
* @return 活动列表
*/
@PostMapping("listactivity")
- R listActivity(@RequestParam("userId") Long userId);
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
/**
* 用户确认心愿
@@ -2197,7 +2216,7 @@
* @return 新增结果
*/
@PostMapping("/addstreet")
- R addStreet(@RequestBody ComStreetVO comStreetVOO);
+ R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
@@ -4941,6 +4960,14 @@
R getWestCommunityLists();
/**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
* 分页查询退役军人列表
*
* @param comExServicemanDTO
@@ -5293,11 +5320,11 @@
R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
/**
- * 根据社区活动id查询社区活动报名人员列表
+ * 根据社区活动id查询社区活动报名且未参与人员列表
*
* @param activityId
* 活动id
- * @return 社区活动报名人员列表
+ * @return 社区活动报名且未参与人员列表
*/
@PostMapping("/integral/act/activity/admin")
R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -7007,6 +7034,22 @@
R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
/**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
* 实有房屋数据修复定时任务
* @return 实有房屋数据修复定时任务
*/
@@ -7129,6 +7172,48 @@
*/
@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);
/**
* 分页查询居家隔离统计
@@ -7611,4 +7696,106 @@
*/
@PostMapping("/screen/index/questionnaireList")
R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/{id}")
+ R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialMember/queryAll")
+ public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialMember/{id}")
+ public R comActSocialMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialMember")
+ public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialMember/update")
+ public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialMember/del")
+ public R comActSocialMemberDelete(@RequestParam("id") Long id);
+
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/comactsocialworker/add")
+ R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comactsocialworker/edit")
+ R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comactsocialworker/page")
+ R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>
+
+ /**
+ * 删除社工
+ * @param comActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/comactsocialworker/delete")
+ R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @PostMapping("/comactsocialworker/{id}")
+ R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+
+ /**
+ * 批量导入社工
+ *
+ * @param list 社工集合
+ */
+ @PostMapping("/comactsocialworker/input")
+ R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);
}
--
Gitblit v1.7.1