From acf418c6598ef68c7730a98008860ea821ba6335 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 15:57:28 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 184 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 173 insertions(+), 11 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 d5fae4b..993004b 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
@@ -2,6 +2,34 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.common.*;
+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.civil.ComActSocialWorkerVO;
+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;
+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;
@@ -22,15 +50,6 @@
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
-import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
@@ -1148,7 +1167,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);
/**
* 用户确认心愿
@@ -8623,7 +8642,7 @@
* @return 查找结果
*/
@PostMapping("/comActSocialWorker/{id}")
- R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
/**
* 批量导入社工
@@ -9332,4 +9351,147 @@
@GetMapping("/activity/partyMemberCount")
R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
+
+ /**
+ * 根据小区id查询楼栋列表
+ * @param villageId 小区id
+ * @return 查询楼栋列表
+ */
+ @GetMapping("/building/getBuildListByVillageId")
+ R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/partyMemberDetail")
+ R partyMemberDetail(@RequestBody CommonPage commonPage);
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/exportPartyMemberDetail")
+ R exportPartyMemberDetail(@RequestBody CommonPage commonPage);
+
+ /**
+ * 金沙定制页面-党建引领基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/partyBuildIng/base")
+ R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/partyAct")
+ R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 议事投票展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/discuss")
+ R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fourMember/base")
+ R getFourMemberBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-五微服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fms/base")
+ R getFmsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-微团队展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fms/team")
+ R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-居家养老基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/base")
+ R getAlarmBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-报警记录展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/alarm/record")
+ R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-报警设备点位图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/pointMap")
+ R getAlarmPointMap(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-志愿服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/volunteer/base")
+ R getVolunteerBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/microWish")
+ R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fourMember/resolve")
+ R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/courtyard/list")
+ R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/courtyard/base")
+ R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/page")
+ R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
}
--
Gitblit v1.7.1