From bda6cd23ba9af8a09ec5e4202ce4fafb1933c39a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 三月 2024 14:59:56 +0800
Subject: [PATCH] 修改参加活动金汇币明细报错4
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 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 b5c4525..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
@@ -38,6 +40,16 @@
@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);
}
/**
@@ -88,6 +100,17 @@
return comActNeighborCircleService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
}
+ /**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("pageNeighborByBigScreen")
+ public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+ return comActNeighborCircleService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
+ }
/**
* 后台添加邻里圈
*
@@ -357,6 +380,11 @@
return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
}
+ @GetMapping("/getNeighborTopicByAppNew")
+ public R getNeighborTopicByAppNew(@RequestParam("name") String name){
+ return comActNeighborCircleTopicService.getNeighborTopicByAppNew(name);
+ }
+
/**
* 删除话题
* @param id
@@ -403,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
@@ -431,4 +477,6 @@
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