From 5c2ed14a85491746f55da8b72f53425b16891c11 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 22 七月 2022 16:25:22 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 c602a97..e10e280 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
@@ -40,6 +42,7 @@
public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
+ neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
return communityService.pageNeighborByApp(neighborCircleAppDTO);
@@ -204,8 +207,9 @@
@ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
public R getNeighborTopicByApp(
- @RequestParam(value = "name",defaultValue = "",required = false) String name) {
- return communityService.getNeighborTopicByApp(name);
+ @RequestParam(value = "name",defaultValue = "",required = false) String name,
+ @RequestParam(value = "belongType", defaultValue = "1", required = false) Integer belongType) {
+ return communityService.getNeighborTopicByApp(name, belongType);
}
@ApiOperation(value = "用户删除邻里圈")
@@ -230,6 +234,7 @@
@ApiOperation(value = "新版接单问题",response =ComActNeighborCircleAppVO.class )
@PostMapping("selectSolve")
public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ neighborCircleAppDTO.setUserId(this.getUserId());
return communityService.selectSolve(neighborCircleAppDTO);
}
@@ -244,5 +249,13 @@
public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
return this.communityService.order(editNeighborCircleAdminVO);
}
+
+ @ApiOperation(value = "服务统计",response = ServiceStaticsVO.class)
+ @PostMapping("/serviceStatic")
+ public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
+ return this.communityService.serviceStatic(serviceStaticDTO);
+ }
+
+
}
--
Gitblit v1.7.1