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/service/ComPbCheckUnitService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.java
index 936d0b4..f20581e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.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 java.util.List;
@@ -27,6 +28,10 @@
* @date 2022-02-16 16:22:26
*/
R queryByPage(PageComPbCheckUnitDto comPbCheckUnit);
+
+ R treeList(TreeListVO treeListVO);
+
+ R orgList();
/**
* description insert 新增数据
@@ -78,6 +83,59 @@
*/
R queryByList(PageComPbCheckUnitDto comPbCheckUnit);
+ /**
+ * 批量导入报道单位
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
R importCheckUnit(List<ComPbCheckUnitExcelVO> list, Long communityId, Long userId);
+ /**
+ * 手机号查询单位详情
+ * @param phone
+ * @return
+ */
+ R detailByPhone(String phone);
+
+ /**
+ * 报到单位统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @return
+ */
+ R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds);
+
+ /**
+ * 报到单位统计
+ * @param commonDto
+ * @return
+ */
+ R unitStatistics(PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @param checkUnitId
+ * @return
+ */
+ R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds);
+
+ /**
+ * 报到党员统计-按单位归属统计
+ * @param commonDto
+ * @return
+ */
+ R pbStatisticsBelong(PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-按单位统计
+ * @param commonDto
+ * @return
+ */
+ R pbStatisticsUnit(PagePbCheckUnitCommonDto commonDto);
}
--
Gitblit v1.7.1