From ee15dfb44e82ebd9b4c135820a08dc50ac0bb82d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Jan 2024 21:55:03 +0800
Subject: [PATCH] 任务字段修改，三色任务修改，走访查询修改
---
src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 5d57040..e33c2aa 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
@@ -16,9 +16,14 @@
*/
package org.springblade.modules.grid.service.impl;
+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.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
+import org.springblade.modules.grid.entity.GridmanEntity;
+import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridWorkLogVO;
import org.springblade.modules.grid.mapper.GridWorkLogMapper;
import org.springblade.modules.grid.service.IGridWorkLogService;
@@ -28,6 +33,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
/**
* 网格工作日志表 服务实现类
@@ -48,8 +55,33 @@
if (null!=dept){
gridWorkLog.setRegionCode(dept.getRegionCode());
}
+ if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("网格员")){
+ gridWorkLog.setGridId(getGridId());
+ }
return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog));
}
+ /**
+ * 获取网格员id
+ * @return
+ */
+ private Integer getGridId() {
+ QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("user_id",AuthUtil.getUserId());
+ List<GridmanEntity> list = SpringUtils.getBean(IGridmanService.class).list(wrapper);
+ if (list.size()>0){
+ return list.get(0).getGridId();
+ }
+ return null;
+ }
-
+ /**
+ * 走访日志数量统计
+ * @param gridId 网格id
+ * @param status 状态
+ * @return
+ */
+ @Override
+ public Integer getGridWorkCountHandleCount(Integer gridId, Integer status) {
+ return baseMapper.getGridWorkCountHandleCount(gridId,status);
+ }
}
--
Gitblit v1.9.3