From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index b75e55d..2db5a64 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -18,7 +18,6 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.common.cache.SysCache;
 import org.springblade.common.param.CommonParamSet;
 import org.springblade.common.utils.RoleUtil;
 import org.springblade.common.utils.SpringUtils;
@@ -126,9 +125,10 @@
 	 */
 	@Override
 	public TaskReportStatistics getStatisticsCount(String houseCode) {
-		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-		Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
-		return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList, isAdministrator);
+		TaskReportForRepairsVO reportForRepairsVO = new TaskReportForRepairsVO();
+		reportForRepairsVO.setHouseCode(houseCode);
+		CommonParamSet invoke = new CommonParamSet<>().invoke(TaskReportForRepairsVO.class, reportForRepairsVO);
+		return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, invoke.getRegionChildCodesList(), invoke.getIsAdministrator());
 	}
 
 	/**
@@ -216,9 +216,11 @@
 	}
 
 	@Override
-	public Integer getStatistics(Long userId, String neiCode) {
+	public Integer getStatistics(Long userId, String neiCode, List<String> regionChildCodesList,
+								Integer isAdministrator,
+								 List<String> gridCodeList) {
 		String roleName = SpringUtils.getRequestParam("roleName");
-		return baseMapper.getStatistics(userId, neiCode,roleName);
+		return baseMapper.getStatistics(userId, neiCode,roleName, regionChildCodesList,isAdministrator, gridCodeList);
 	}
 
 	/**

--
Gitblit v1.9.3