From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 09eabae..b14907a 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -19,9 +19,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.util.NetUtil;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -29,6 +33,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.flow.business.service.IFlowService;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.entity.BladeFlow;
@@ -39,8 +44,12 @@
import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
+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.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.system.entity.Dept;
@@ -55,6 +64,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 物业维修资金申请表 服务实现类
@@ -64,29 +74,41 @@
*/
@Service
public class PropertyCapitalApplyServiceImpl extends ServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
-
+ private static Logger logger = LoggerFactory.getLogger(NetUtil.class);
@Autowired
private IDeptService deptService;
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- propertyCapitalApply.setRegionCode(dept.getRegionCode());
- }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly")) {
- IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
- List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- if (strings.size() > 0) {
- propertyCapitalApply.setDistrictIdList(strings);
- } else {
- return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
+ if (userRole.contains("wygly")|| userRole.contains("wyxmjl")) {
+ // 查询小区id
+ IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
+ List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+ // 通过用户机构查询用户的物业公司
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ if (one != null) {
+ IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // 通过物业公司，查询小区
+ List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
+ if (list.size() > 0) {
+ List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
+ districtIds.addAll(collect);
+ }
+ }
+ propertyCapitalApply.setDistrictIdList(districtIds);
+ if (districtIds.size() == 0) {
+ return page.setRecords(new ArrayList<>());
}
}
- return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
+ return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply, regionChildCodesList, isAdministrator));
}
@Autowired
@@ -133,19 +155,35 @@
.eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
+ logger.error("街道信息不存在", e);
throw new ServiceException("街道信息不存在");
}
- // 查询住建局负责人
- User user4 = null;
+ // 查询信州区住建局负责人
+ User user5 = null;
try {
- Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
- Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, region2.getName() + "住建局").last("limit 1"));
- user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
+ user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
.eq(User::getRoleId, "1738072768615333890")
.eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
- throw new ServiceException("住建局信息不存在");
+ logger.error("信州区住建局信息不存在", e);
+ throw new ServiceException("信州区住建局信息不存在");
+ }
+
+ // 查询上饶市住建局负责人
+ User user6 = null;
+ try {
+// Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
+ Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
+ user6 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+ .eq(User::getRoleId, "1738072768615333890")
+ .eq(User::getIsDeleted, 0)
+ .last("limit 1"));
+ } catch (Exception e) {
+ logger.error("上饶市住建局信息不存在", e);
+ throw new ServiceException("上饶市住建局信息不存在");
}
Kv variables = null;
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
@@ -159,7 +197,8 @@
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
- .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
} else {
@@ -176,7 +215,8 @@
variables = Kv.create()
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
- .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
}
--
Gitblit v1.9.3