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/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
index e23728e..ca6d07b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.TreeListVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
@@ -33,6 +34,11 @@
@PostMapping("/page")
R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);
+ @PostMapping("/treeList")
+ R treeList(@RequestBody TreeListVO treeListVO);
+
+ @GetMapping("/orgList")
+ public R orgList();
/**
* description insert 新增数据
*
@@ -109,7 +115,8 @@
@GetMapping("/statistics/top")
R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
@RequestParam(value = "belongTo") String belongTo,
- @RequestParam(value = "choice", required = false) String choice);
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds);
/**
* 报到单位统计
@@ -131,7 +138,8 @@
R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
@RequestParam(value = "belongTo") String belongTo,
@RequestParam(value = "choice", required = false) String choice,
- @RequestParam(value = "checkUnitId", required = false) Long checkUnitId);
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds);
/**
* 报到党员统计-按单位归属统计
--
Gitblit v1.7.1