From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index e10e280..9d79434 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -48,6 +48,18 @@
return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
+ @ApiOperation(value = "分页查询可关联清单列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("pageRelationList")
+ public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ neighborCircleAppDTO.setCheckUnitId(loginUserInfo.getCheckUnitId());
+ }
+ return communityService.pageRelationList(neighborCircleAppDTO);
+ }
+
@ApiOperation(value = "用户发布邻里圈审核")
@PostMapping("addNeighborByApp")
public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
@@ -207,9 +219,8 @@
@ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
public R getNeighborTopicByApp(
- @RequestParam(value = "name",defaultValue = "",required = false) String name,
- @RequestParam(value = "belongType", defaultValue = "1", required = false) Integer belongType) {
- return communityService.getNeighborTopicByApp(name, belongType);
+ @RequestParam(value = "name",defaultValue = "",required = false) String name) {
+ return communityService.getNeighborTopicByApp(name);
}
@ApiOperation(value = "用户删除邻里圈")
@@ -256,6 +267,16 @@
return this.communityService.serviceStatic(serviceStaticDTO);
}
-
+ /**
+ * 求助我的问题数量统计
+ * @param type
+ * @param phone
+ * @return
+ */
+ @ApiOperation(value = "求助我的问题数量统计")
+ @GetMapping("/selectCount")
+ public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
+ return this.communityService.selectCount(type,phone,communityId);
+ }
}
--
Gitblit v1.7.1