From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 bf01149..2f222c5 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
@@ -19,7 +19,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.constant.CommonConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
@@ -29,18 +28,12 @@
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.grid.entity.GridmanEntity;
-import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.house.entity.HouseEntity;
-import org.springblade.modules.house.service.IHouseService;
-import org.springblade.modules.place.entity.PlaceEntity;
-import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.sse.server.SSEServer;
-import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
@@ -48,7 +41,6 @@
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
-import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -69,11 +61,6 @@
@Autowired
private ITaskService taskService;
- @Autowired
- private IGridService gridService;
-
- @Autowired
- private IDeptService deptService;
/**
* 自定义分页
@@ -87,7 +74,6 @@
// 公共参数设置
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
- List<String> addressCodeList = new ArrayList<>();
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -124,7 +110,7 @@
aoiCodeList = districtEntityList.stream().map(i -> i.getAoiCode()).collect(Collectors.toList());
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, addressCodeList,
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,
commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), aoiCodeList, commonParamSet.getGridCodeList()));
}
@@ -226,7 +212,8 @@
@Override
public Integer getStatistics(Long userId, String neiCode) {
- return baseMapper.getStatistics(userId, neiCode);
+ String roleName = SpringUtils.getRequestParam("roleName");
+ return baseMapper.getStatistics(userId, neiCode,roleName);
}
/**
--
Gitblit v1.9.3