From ccd28a0c35e8fff74da6ef63042fb8a896d78f7f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 六月 2022 09:45:52 +0800
Subject: [PATCH] 单位服务统计
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 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..681474c 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,18 @@
@PostMapping("pageNeighborByApp")
public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
return comActNeighborCircleService.pageNeighborByApp(neighborCircleAppDTO);
+ }
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("selectSolve")
+ public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.selectSolve(neighborCircleAppDTO);
}
/**
@@ -335,23 +349,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 +377,23 @@
return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO);
}
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @PostMapping("update")
+ public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
+ return this.comActNeighborCircleService.orderAndSolve(editNeighborCircleAdminVO);
+ }
+
+ /**
+ * 机关单位服务统计排行
+ * @return
+ * */
+ @GetMapping("institutionalUnitServiceAnalysis")
+ public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "communityId",required = false) Long communityId){
+ return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,communityId);
+ }
+
}
--
Gitblit v1.7.1