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/grid/service/impl/GridWorkLogServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
index ef07937..b5218da 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
@@ -48,12 +49,15 @@
@Override
public IPage<GridWorkLogVO> selectGridWorkLogPage(IPage<GridWorkLogVO> page, GridWorkLogVO gridWorkLog) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(GridWorkLogVO.class,gridWorkLog);
if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("网格员")){
gridWorkLog.setGridId(getGridId());
}
- return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog,regionChildCodesList,isAdministrator));
+ return page.setRecords(baseMapper.selectGridWorkLogPage(page,
+ gridWorkLog,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getIsAdministrator()));
}
/**
* 获取网格员id
@@ -71,12 +75,12 @@
/**
* 走访日志数量统计
- * @param gridId 网格id
+ * @param gridCode 网格编号
* @param status 状态
* @return
*/
@Override
- public Integer getGridWorkCountHandleCount(Integer gridId, Integer status) {
- return baseMapper.getGridWorkCountHandleCount(gridId,status);
+ public Integer getGridWorkCountHandleCount(String gridCode, Integer status) {
+ return baseMapper.getGridWorkCountHandleCount(gridCode,status);
}
}
--
Gitblit v1.9.3