From 7304ecaf9482c3519e3c74fe5a2838df169e787b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 19 十月 2022 11:17:55 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java |   95 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 86 insertions(+), 9 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 daff928..8de43b3 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
@@ -2,6 +2,8 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +38,28 @@
     @PostMapping("pageNeighborByApp")
     public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
         return comActNeighborCircleService.pageNeighborByApp(neighborCircleAppDTO);
+    }
+
+    /**
+     * 分页查询可关联清单列表
+     * @param neighborCircleAppDTO
+     * @return
+     */
+    @PostMapping("pageRelationList")
+    public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+        return comActNeighborCircleService.pageRelationList(neighborCircleAppDTO);
+    }
+
+    /**
+     * 分页查询邻里圈列表
+     *
+     * @param neighborCircleAppDTO
+     *            请求参数
+     * @return 邻里圈列表
+     */
+    @PostMapping("selectSolve")
+    public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+        return comActNeighborCircleService.selectSolve(neighborCircleAppDTO);
     }
 
     /**
@@ -335,23 +359,22 @@
     /**
      * 小程序查询邻里圈话题列表
      *
-     * @param communityId
      *            社区id
      * @return 邻里圈话题列表
      */
     @GetMapping("getNeighborTopicByApp")
-    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType) {
-        return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name,belongType);
+    public R getNeighborTopicByApp(@RequestParam("name") String name) {
+        return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
     }
 
     /**
-     * 小程序-用户新增话题
-     * @param circleTopicAppDTO 请求参数
-     * @return  新增结果
+     * 删除话题
+     * @param id
+     * @return
      */
-    @PostMapping("addNeighborTopicByApp")
-    public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
-        return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO);
+    @GetMapping("deleteNeighborTopic")
+    public R deleteNeighborTopic(@RequestParam("id") Long id){
+        return comActNeighborCircleTopicService.delete(id);
     }
 
     /**
@@ -364,4 +387,58 @@
         return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO);
     }
 
+    /**
+     * 修改数据
+     * @param editNeighborCircleAdminVO
+     * @return
+     */
+    @PostMapping("update")
+    public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
+        return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO);
+    }
+
+    /**
+     * 机关单位服务统计排行
+     * @return
+     * */
+    @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,
+                                              @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);
+    }
+
+    /**
+     * 小程序服务统计
+     * @param serviceStaticDTO
+     * @return
+     */
+    @PostMapping("/serviceStatic")
+    public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
+        return this.comActNeighborCircleService.serviceStatic(serviceStaticDTO);
+    }
+
+    /**
+     * 后台统计
+     * @param serviceStaticDTO
+     * @return
+     */
+    @PostMapping("/serviceStaticBackstage")
+    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