From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 150 ++++++++++++++++++++++++++-----------------------
1 files changed, 80 insertions(+), 70 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 d43ca8e..09eabae 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
@@ -53,6 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -64,18 +65,27 @@
@Service
public class PropertyCapitalApplyServiceImpl extends ServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
+
+ @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());
+ }
// 判断角色，物业角色只能查询当前小区的
-
String userRole = AuthUtil.getUserRole();
if (userRole.contains("wygly")) {
IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- propertyCapitalApply.setDistrictIdList(strings);
+ if (strings.size() > 0) {
+ propertyCapitalApply.setDistrictIdList(strings);
+ } else {
+ return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
+ }
}
-
-
return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
}
@@ -90,37 +100,37 @@
public boolean startProcess(PropertyCapitalApplyVO applyVO) {
String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
if (Func.isEmpty(applyVO.getId())) {
- // 保存leave
- applyVO.setApplyTime(DateUtil.now());
- save(applyVO);
- // 判断是否有业委会，查询业委会负责人
- IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
- OwnersCommitteeEntity one = 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) {
- 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()
- .eq(DistrictEntity::getId, applyVO.getDistrictId()));
+ // 保存leave
+ applyVO.setApplyTime(DateUtil.now());
+ save(applyVO);
+ // 判断是否有业委会，查询业委会负责人
+ IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
+ OwnersCommitteeEntity one = 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) {
+ 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()
+ .eq(DistrictEntity::getId, applyVO.getDistrictId()));
User one4 = 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)
+ .eq(User::getRoleId, "1729814500990304258")
+ .eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
throw new ServiceException("街道信息不存在");
@@ -131,55 +141,55 @@
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())
- .eq(User::getRoleId,"1738072768615333890")
- .eq(User::getIsDeleted,0)
+ .eq(User::getRoleId, "1738072768615333890")
+ .eq(User::getIsDeleted, 0)
.last("limit 1"));
} catch (Exception e) {
throw new ServiceException("住建局信息不存在");
}
Kv variables = null;
- ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
- // 启动流程
- if (CommonConstant.NUMBER_ONE.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())) {
- applyVO.setApplyStatus(CommonConstant.NUMBER_ONE);
- ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("haveMaintenanceFundApply").singleResult();
- applyVO.setProcessDefinitionId(processDefinition.getId());
- // 有物业和有业委会
- 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(user4.getId().toString()))
- .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
- .set("ownersCommitteeFlag", ownersCommitteeFlag);
- } else {
- if(CommonConstant.NUMBER_TWO.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())){
- // 有物业和无业委会
+ ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
+ // 启动流程
+ if (CommonConstant.NUMBER_ONE.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())) {
+ applyVO.setApplyStatus(CommonConstant.NUMBER_ONE);
ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("haveMaintenanceFundApply").singleResult();
applyVO.setProcessDefinitionId(processDefinition.getId());
- }else {
- // 无物业和无业委会
- ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("notMaintenanceFundApply").singleResult();
- applyVO.setProcessDefinitionId(processDefinition.getId());
+ // 有物业和有业委会
+ 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(user4.getId().toString()))
+ .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
+ .set("ownersCommitteeFlag", ownersCommitteeFlag);
+ } else {
+ if (CommonConstant.NUMBER_TWO.equals(ownersCommitteeFlag) && CommonConstant.NUMBER_ONE.equals(applyVO.getPropertyFlag())) {
+ // 有物业和无业委会
+ ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("haveMaintenanceFundApply").singleResult();
+ applyVO.setProcessDefinitionId(processDefinition.getId());
+ } else {
+ // 无物业和无业委会
+ ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("notMaintenanceFundApply").singleResult();
+ applyVO.setProcessDefinitionId(processDefinition.getId());
+ }
+ 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(user4.getId().toString()))
+ .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
+ .set("ownersCommitteeFlag", ownersCommitteeFlag);
}
- 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(user4.getId().toString()))
- .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
- .set("ownersCommitteeFlag", ownersCommitteeFlag);
- }
- BladeFlow flow = flowService.startProcessInstanceById(applyVO.getProcessDefinitionId(),
- FlowUtil.getBusinessKey(businessTable, String.valueOf(applyVO.getId())), variables);
- if (Func.isNotEmpty(flow)) {
- log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
- // 返回流程id写入leave
- applyVO.setProcessInstanceId(flow.getProcessInstanceId());
- updateById(applyVO);
- } else {
- throw new ServiceException("开启流程失败");
- }
+ BladeFlow flow = flowService.startProcessInstanceById(applyVO.getProcessDefinitionId(),
+ FlowUtil.getBusinessKey(businessTable, String.valueOf(applyVO.getId())), variables);
+ if (Func.isNotEmpty(flow)) {
+ log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
+ // 返回流程id写入leave
+ applyVO.setProcessInstanceId(flow.getProcessInstanceId());
+ updateById(applyVO);
+ } else {
+ throw new ServiceException("开启流程失败");
+ }
} else {
updateById(applyVO);
}
--
Gitblit v1.9.3