From f6f928d81ad53f424f35a9149db11b301ed7f8a8 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期一, 22 四月 2024 16:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 67a4801..5849835 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
@@ -12,6 +12,8 @@
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
+import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
+import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
@@ -9952,12 +9954,16 @@
* 单位活动统计
*/
@GetMapping("/neighbor/activityAnalysis")
- 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,
+ 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 = "size",required = false) Integer size,
@RequestParam(value = "belongTo",required = false) String belongTo,
- @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount,
+ @RequestParam(value = "searchContent",required = false) String searchContent);
@GetMapping("/neighbor/export")
public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
@@ -11885,5 +11891,18 @@
@GetMapping("/largeScreen/probably")
public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo);
+ /**
+ * 查询 一标三实 数据
+ */
+ @GetMapping("/largeScreen/sumAreaStreet")
+ R<SumAreaStreetResp> sumAreaStreet();
+
+
+ /**
+ * 下拉 明细
+ */
+ @GetMapping(("/largeScreen/areaStreetDetail"))
+ R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code,
+ @RequestParam("type") String type);
}
--
Gitblit v1.7.1