From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 e1e7ef1..502b592 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,8 +2,8 @@
import javax.annotation.Resource;
-import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
-import org.springframework.beans.BeanUtils;
+import com.panzhihua.common.model.dtos.ExcelDO;
+import com.panzhihua.common.model.dtos.PartyExcelDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +17,8 @@
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
@Slf4j
@RestController
@@ -378,6 +380,11 @@
return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
}
+ @GetMapping("/getNeighborTopicByAppNew")
+ public R getNeighborTopicByAppNew(@RequestParam("name") String name){
+ return comActNeighborCircleTopicService.getNeighborTopicByAppNew(name);
+ }
+
/**
* 删除话题
* @param id
@@ -424,6 +431,24 @@
}
/**
+ * 导出
+ */
+ @GetMapping("/export")
+ public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId) throws Exception {
+ return this.comActNeighborCircleService.export(year,belongTo,communityId);
+ }
+
+ @GetMapping("/partyExcel")
+ public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "unitId",required = false) Long unitId){
+ return this.comActNeighborCircleService.partyExcel(year,belongTo,communityId,unitId);
+ }
+
+ /**
* 小程序服务统计
* @param serviceStaticDTO
* @return
--
Gitblit v1.7.1