From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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..b75e55d 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;
/**
* 自定义分页
@@ -86,8 +73,10 @@
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
// 公共参数设置
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
- taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
- List<String> addressCodeList = new ArrayList<>();
+ String userRole = AuthUtil.getUserRole();
+ if (RoleUtil.isProperty(userRole) || RoleUtil.isWgy(userRole)){
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+ }
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -96,7 +85,6 @@
taskReportForRepairs.setRoleType("inhabitant");
}
}
- String userRole = AuthUtil.getUserRole();
List<String> aoiCodeList = new ArrayList<>();
if (RoleUtil.isProperty(userRole)) {
taskReportForRepairs.setRoleType("wy");
@@ -105,7 +93,10 @@
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
+ .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId())
+ .eq(PropertyCompanyEntity::getIsDeleted, 0)
+ .last("limit 1"));
if (companyEntity != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
@@ -124,7 +115,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 +217,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