From f0e91343445b1e568d1dfe705252d3e1201a18a7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 七月 2022 18:02:36 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
index 5b62d0a..529c53e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -5,7 +5,6 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbCheckUnitTypeEnum;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.common.utlis.StringUtils;
@@ -242,11 +241,12 @@
* 报到单位统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
* @return
*/
@Override
- public R unitStatisticsTop(Long communityId, String belongTo) {
- return R.ok(this.baseMapper.unitStatisticsTop(communityId, belongTo));
+ public R unitStatisticsTop(Long communityId, String belongTo, String choice) {
+ return R.ok(this.baseMapper.unitStatisticsTop(communityId, belongTo, choice));
}
/**
@@ -263,11 +263,13 @@
* 报到党员统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
+ * @param checkUnitId
* @return
*/
@Override
- public R pbStatisticsTop(Long communityId, String belongTo) {
- return R.ok(this.baseMapper.pbStatisticsTop(communityId, belongTo));
+ public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId) {
+ return R.ok(this.baseMapper.pbStatisticsTop(communityId, belongTo, choice, checkUnitId));
}
/**
--
Gitblit v1.7.1