From c5dc6db7a22b375f2f9302260fd084953edd9068 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 22 Dec 2023 09:38:24 +0800
Subject: [PATCH] 租赁新增，删除修改
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 56a4b58..89177f4 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
@@ -127,7 +127,7 @@
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()))
@@ -136,10 +136,16 @@
.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);
- ProcessDefinition processDefinition = processDefinitionQuery.processDefinitionKey("notMaintenanceFundApply").singleResult();
- applyVO.setProcessDefinitionId(processDefinition.getId());
- // 经过街道
variables = Kv.create()
.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
.set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
--
Gitblit v1.9.3