From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 二月 2022 14:07:48 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 600 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 593 insertions(+), 7 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 c468e55..ead47d9 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,37 @@
package com.panzhihua.common.service.community;
+import java.io.Serializable;
+import java.util.Date;
import java.util.List;
+import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
+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 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;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -262,11 +291,6 @@
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;
@@ -1099,7 +1123,6 @@
*
* @param userId
* 用户id
- * @param status
* @return 活动列表
*/
@PostMapping("listactivity")
@@ -2229,7 +2252,7 @@
* @return 新增结果
*/
@PostMapping("/addstreet")
- R addStreet(@RequestBody ComStreetVO comStreetVOO);
+ R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
@@ -2529,6 +2552,17 @@
*/
@PostMapping("/common/data/population/page")
R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
+ * 导出老人
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/exportOld")
+ R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
/**
* 根据身份证查询实有人口信息
@@ -8281,4 +8315,556 @@
@PostMapping("/common/data/history/filled")
R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区后台-分页查询志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织队伍
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/page")
+ R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-新增志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/add")
+ R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-编辑志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerOrgTeam/edit")
+ R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-删除志愿者组织队伍
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/delete")
+ R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者组织列表
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织列表
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/list")
+ R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-分页查询服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 服务类型列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/page")
+ R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-新增服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerServiceType/add")
+ R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-编辑服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerServiceType/edit")
+ R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-删除服务类型
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerServiceType/delete")
+ R deleteServiceTypeAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-分页查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/page")
+ R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-新增志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerSkill/add")
+ R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-编辑志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerSkill/edit")
+ R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-删除志愿者技能
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerSkill/delete")
+ R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者服务类型列表
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 志愿者服务列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/list")
+ R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/list")
+ R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-志愿者组织统计
+ *
+ * @param communityId 社区id
+ * @return 志愿者组织统计
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/statistics")
+ R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 志愿者导入
+ *
+ * @param list 志愿者数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/volunteer/import/admin")
+ R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ @PostMapping("/screen/hmk/baseInfo")
+ R hmkBaseInfo(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/screen/hmk/partyProjectActivityLine")
+ R partyProjectActivityLine();
+
+ @PostMapping("/screen/hmk/projectActivityTop")
+ R projectActivityProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/{id}")
+ R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/selectByUserId")
+ R selectOneByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @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("/comActSocialProjectMember/batch")
+ public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO 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);
+
+ /**
+ *活动查询社工列表
+ * @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);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProject/queryAll")
+ R selectAllComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProject/{id}")
+ R selectOneComActSocialProject(@PathVariable("id") Long id);
+
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @PostMapping("/comActSocialProject/getRelation")
+ R getRelationComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProject")
+ R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProject/update")
+ R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProject/del")
+ R deleteComActSocialProject(@RequestParam("id") Long id);
+ /**
+ * 小程序详情接口
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialProject/getApplet")
+ R getAppletComActSocialProject(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectMember/queryAll")
+ public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectMember/{id}")
+ public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember")
+ public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectMember/update")
+ public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectMember/del")
+ public R deleteComActSocialProjectMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectPublicity/queryAll")
+ public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
+ public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
+
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectPublicity")
+ public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectPublicity/update")
+ public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/del")
+ public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/delBatch")
+ public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectSchedule/queryAll")
+ public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectSchedule/{id}")
+ public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectSchedule")
+ public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectSchedule/update")
+ public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectSchedule/del")
+ public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);
+
+ /**
+ * 项目分类级联
+ * @param comActColumnVO
+ * @return
+ */
+ @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);
}
--
Gitblit v1.7.1