From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 30562cd..8821c0c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -21,6 +21,8 @@
 import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
 import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
 import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
@@ -5019,12 +5021,19 @@
     /**
      * 小程序查询邻里圈话题列表
      *
-     * @param communityId
      *            社区id
      * @return 邻里圈话题列表
      */
     @GetMapping("/neighbor/getNeighborTopicByApp")
-    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType);
+    R getNeighborTopicByApp(@RequestParam("name") String name);
+
+    /**
+     * 删除话题
+     * @param id
+     * @return
+     */
+    @GetMapping("/neighbor/deleteNeighborTopic")
+    R deleteNeighborTopic(@RequestParam("id") Long id);
 
     /**
      * 综治后台-查询社区列表
@@ -9669,6 +9678,54 @@
     @GetMapping("/comAreaTownCommunity/areaTownCommunity")
     R areaTownCommunity(@RequestParam("name")String name);
 
+    /**
+     * 物业公司详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/comProperty/detail")
+    R detailProperty(@RequestParam("id") Long id);
+
+    /**
+     * 添加物业工作人员
+     * @param propertyWorkerDTO
+     * @return
+     */
+    @PostMapping("/comPropertyWorker/add")
+    R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+    /**
+     * 编辑物业工作人员
+     * @param propertyWorkerDTO
+     * @return
+     */
+    @PutMapping("/comPropertyWorker/update")
+    R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+    /**
+     * 删除物业工作人员
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/comPropertyWorker/delete")
+    R deletePropertyWorker(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询物业工作人员
+     * @param pagePropertyWorkerDTO
+     * @return
+     */
+    @PostMapping("/comPropertyWorker/page")
+    R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);
+
+    /**
+     * 物业工作人员详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/comPropertyWorker/detail")
+    R detailPropertyWorker(@RequestParam("id") Long id);
+
 
     /**
      * 分页查询所有数据

--
Gitblit v1.7.1