From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 93c0de7..e1e7ef1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -41,6 +41,16 @@
}
/**
+ * 分页查询可关联清单列表
+ * @param neighborCircleAppDTO
+ * @return
+ */
+ @PostMapping("pageRelationList")
+ public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.pageRelationList(neighborCircleAppDTO);
+ }
+
+ /**
* 分页查询邻里圈列表
*
* @param neighborCircleAppDTO
@@ -88,6 +98,17 @@
return comActNeighborCircleService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
}
+ /**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("pageNeighborByBigScreen")
+ public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+ return comActNeighborCircleService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
+ }
/**
* 后台添加邻里圈
*
@@ -393,8 +414,13 @@
* */
@GetMapping("/activityAnalysis")
public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId){
- return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId);
+ @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
}
/**
@@ -416,6 +442,16 @@
public R serviceStaticBackstage(@RequestBody ServiceStaticBackstageDTO serviceStaticDTO){
return this.comActNeighborCircleService.serviceStaticBackstage(serviceStaticDTO);
}
+ /**
+ * 求助我的问题数量统计
+ * @param type
+ * @param phone
+ * @return
+ */
+ @GetMapping("/selectCount")
+ public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
+ return this.comActNeighborCircleService.selectCount(type,phone,communityId);
+ }
}
--
Gitblit v1.7.1