From 79d022f98239e5f029bdca3adf38ca4a39e15143 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 14 九月 2022 16:14:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 5730e9b..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
@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+
/**
* @auther lyq
* @create 2021-04-14 15:02:49
@@ -44,6 +46,18 @@
neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
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 = "用户发布邻里圈审核")
@@ -231,6 +245,7 @@
@ApiOperation(value = "新版接单问题",response =ComActNeighborCircleAppVO.class )
@PostMapping("selectSolve")
public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ neighborCircleAppDTO.setUserId(this.getUserId());
return communityService.selectSolve(neighborCircleAppDTO);
}
@@ -251,5 +266,17 @@
public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
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