From 0c29964e2a69410f15ccf4271aa9180012737f71 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 22 Dec 2023 15:59:32 +0800
Subject: [PATCH] 维修基金审核+业委会

---
 src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
index 0db6bba..d8d1bdd 100644
--- a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -17,6 +17,7 @@
 package org.springblade.flow.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.TaskService;
@@ -25,6 +26,7 @@
 import org.flowable.task.api.TaskQuery;
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
@@ -37,6 +39,8 @@
 import org.springblade.flow.engine.constant.FlowEngineConstant;
 import org.springblade.flow.engine.entity.FlowProcess;
 import org.springblade.flow.engine.utils.FlowCache;
+import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
+import org.springblade.modules.property.service.IPropertyCapitalApplyService;
 import org.springframework.stereotype.Service;
 
 import java.util.LinkedList;
@@ -237,6 +241,14 @@
 					flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
 				}
 			}
+			IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
+			PropertyCapitalApplyEntity capitalApplyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, historicTaskInstance.getProcessInstanceId()));
+			if (capitalApplyEntity != null) {
+				flow.setName(capitalApplyEntity.getName());
+				flow.setDistrictId(capitalApplyEntity.getDistrictId());
+				flow.setLinkman(capitalApplyEntity.getLinkman());
+				flow.setLinkPhone(capitalApplyEntity.getLinkPhone());
+			}
 			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
 			flowList.add(flow);
 		});
@@ -306,6 +318,14 @@
 				flow.setBusinessTable(businessKey[0]);
 				flow.setBusinessId(businessKey[1]);
 			}
+			IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
+			PropertyCapitalApplyEntity capitalApplyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, task.getProcessInstanceId()));
+			if (capitalApplyEntity != null) {
+				flow.setName(capitalApplyEntity.getName());
+				flow.setDistrictId(capitalApplyEntity.getDistrictId());
+				flow.setLinkman(capitalApplyEntity.getLinkman());
+				flow.setLinkPhone(capitalApplyEntity.getLinkPhone());
+			}
 
 			FlowProcess processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId());
 			flow.setCategory(processDefinition.getCategory());

--
Gitblit v1.9.3