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_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
index 7acc80f..79c6b21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_dangjian.api;
import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
+import com.panzhihua.common.model.vos.TreeListVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
import com.panzhihua.common.model.dtos.common.*;
@@ -40,6 +41,15 @@
return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
}
+ @PostMapping("/treeList")
+ public R treeList(@RequestBody TreeListVO treeListVO){
+ return this.comPbCheckUnitService.treeList(treeListVO);
+ }
+
+ @GetMapping("/orgList")
+ public R orgList(){
+ return this.comPbCheckUnitService.orgList();
+ }
/**
* description add 新增数据
*
@@ -140,8 +150,9 @@
@GetMapping("/statistics/top")
public R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
@RequestParam(value = "belongTo") String belongTo,
- @RequestParam(value = "belongTo", required = false) String choice) {
- return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice);
+ @RequestParam(value = "belongTo", required = false) String choice,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
+ return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice,unitIds);
}
/**
@@ -166,8 +177,9 @@
public 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) {
- return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo, choice, checkUnitId);
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
+ return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo, choice, checkUnitId,unitIds);
}
/**
--
Gitblit v1.7.1