From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..d81651c 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;
@@ -115,8 +114,9 @@
aoiCodeList = districtEntityList.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,
- commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList()));
+ List list = baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList(),commonParamSet.getCommunityCode());
+ return page.setRecords(list);
}
/**
@@ -126,9 +126,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 +217,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