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/grid/service/impl/GridWorkLogServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 e33c2aa..b40ec49 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
@@ -19,6 +19,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -45,20 +47,17 @@
@Service
public class GridWorkLogServiceImpl extends ServiceImpl<GridWorkLogMapper, GridWorkLogEntity> implements IGridWorkLogService {
-
- @Autowired
- private IDeptService deptService;
-
@Override
public IPage<GridWorkLogVO> selectGridWorkLogPage(IPage<GridWorkLogVO> page, GridWorkLogVO gridWorkLog) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- gridWorkLog.setRegionCode(dept.getRegionCode());
- }
- if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("网格员")){
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(GridWorkLogVO.class,gridWorkLog);
+ if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("wgy")){
gridWorkLog.setGridId(getGridId());
}
- return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog));
+ return page.setRecords(baseMapper.selectGridWorkLogPage(page,
+ gridWorkLog,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getIsAdministrator()));
}
/**
* 获取网格员id
@@ -76,12 +75,17 @@
/**
* 走访日志数量统计
- * @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);
+ }
+
+ @Override
+ public GridWorkLogVO getDetail(GridWorkLogEntity gridWorkLog) {
+ return baseMapper.getDetail(gridWorkLog);
}
}
--
Gitblit v1.9.3