From 429dfc282e6e9bb1629f6b8e8224610a070b6301 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 10:04:12 +0800
Subject: [PATCH] 维修基金代码优化
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 79 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 34 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 b14907a..43be807 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
@@ -85,7 +85,7 @@
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly")|| userRole.contains("wyxmjl")) {
+ if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
// 查询小区id
IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
@@ -127,60 +127,71 @@
save(applyVO);
// 判断是否有业委会，查询业委会负责人
IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
- OwnersCommitteeEntity one = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
+ OwnersCommitteeEntity ywhInfo = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
.eq(OwnersCommitteeEntity::getAreaId, applyVO.getDistrictId())
.eq(OwnersCommitteeEntity::getDeleteFlag, 0)
.eq(OwnersCommitteeEntity::getStatus, 0)
.last("limit 1"));
Integer ownersCommitteeFlag = CommonConstant.NUMBER_TWO;
- if (one != null && one.getPrincipalId() != null) {
+ if (ywhInfo != null && ywhInfo.getPrincipalId() != null) {
+ // 有业委会
ownersCommitteeFlag = CommonConstant.NUMBER_ONE;
}
// 查询街道负责人 通过小区id 查询街道编码
// 通过街道编码查询街道名称，
// 通过街道名称查询 人的部门是街道名称的
- IUserService user = SpringUtils.getBean(IUserService.class);
- IDistrictService district = SpringUtils.getBean(IDistrictService.class);
- IRegionService region = SpringUtils.getBean(IRegionService.class);
- IDeptService dept = SpringUtils.getBean(IDeptService.class);
- DistrictEntity one1 = district.getOne(Wrappers.<DistrictEntity>lambdaQuery()
+ IUserService userService = SpringUtils.getBean(IUserService.class);
+ IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
+ IRegionService regionService = SpringUtils.getBean(IRegionService.class);
+ IDeptService deptService = SpringUtils.getBean(IDeptService.class);
+ DistrictEntity districtEntity = districtService.getOne(Wrappers.<DistrictEntity>lambdaQuery()
.eq(DistrictEntity::getId, applyVO.getDistrictId()));
- User one4 = null;
+ User jdUserInfo = null;
// 查询街道责人
try {
- Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9)));
- Dept one3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, one2.getName()));
- one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId())
- .eq(User::getRoleId, "1729814500990304258")
- .eq(User::getIsDeleted, 0)
- .last("limit 1"));
+ Region regionServiceOne = regionService.getOne(Wrappers.<Region>lambdaQuery()
+ .eq(Region::getCode, districtEntity.getCommunityCode().substring(0, 9)));
+
+ Dept deptServiceOne = deptService.getOne(Wrappers.<Dept>lambdaQuery()
+ .eq(Dept::getDeptName, regionServiceOne.getName()));
+
+ jdUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, deptServiceOne.getId())
+ .eq(User::getRoleId, "1729814500990304258").eq(User::getIsDeleted, 0).last("limit 1"));
+ if (jdUserInfo == null) {
+ logger.error("街道信息不存在***");
+ throw new ServiceException("街道信息不存在");
+ }
} catch (Exception e) {
logger.error("街道信息不存在", e);
throw new ServiceException("街道信息不存在");
}
// 查询信州区住建局负责人
- User user5 = null;
+ User xzUserInfo = 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"));
- user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
- .eq(User::getRoleId, "1738072768615333890")
- .eq(User::getIsDeleted, 0)
- .last("limit 1"));
+ Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
+ xzUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+ .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
+ if (xzUserInfo == null) {
+ logger.error("信州区住建局信息不存在***");
+ throw new ServiceException("信州区住建局信息不存在");
+ }
} catch (Exception e) {
logger.error("信州区住建局信息不存在", e);
throw new ServiceException("信州区住建局信息不存在");
}
// 查询上饶市住建局负责人
- User user6 = null;
+ User srUserInfo = 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"));
+ Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
+ srUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+ .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
+ if (srUserInfo == null) {
+ logger.error("上饶市住建局信息不存在***");
+ throw new ServiceException("上饶市住建局信息不存在");
+ }
} catch (Exception e) {
logger.error("上饶市住建局信息不存在", e);
throw new ServiceException("上饶市住建局信息不存在");
@@ -195,10 +206,10 @@
// 有物业和有业委会
variables = Kv.create()
.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(user5.getId().toString()))
- .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
+ .set("ownersCommitteeUser", TaskUtil.getTaskUser(ywhInfo.getPrincipalId().toString()))
+ .set("streetUser", TaskUtil.getTaskUser(jdUserInfo.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(xzUserInfo.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(srUserInfo.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
} else {
@@ -214,9 +225,9 @@
applyVO.setApplyStatus(CommonConstant.NUMBER_TWO);
variables = Kv.create()
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
- .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
- .set("constructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
- .set("srConstructionUser", TaskUtil.getTaskUser(user6.getId().toString()))
+ .set("streetUser", TaskUtil.getTaskUser(jdUserInfo.getId().toString()))
+ .set("constructionUser", TaskUtil.getTaskUser(xzUserInfo.getId().toString()))
+ .set("srConstructionUser", TaskUtil.getTaskUser(srUserInfo.getId().toString()))
.set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
.set("ownersCommitteeFlag", ownersCommitteeFlag);
}
--
Gitblit v1.9.3