From 9498ecfe58803b877133cd0bb80301ad0922ad86 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 15:36:32 +0800
Subject: [PATCH] 首页待办查询bug
---
business/src/main/java/com/ycl/domain/vo/IndexCustomerTaskVO.java | 2 +-
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 27 +++++++++++++++++++++------
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/IndexCustomerTaskVO.java b/business/src/main/java/com/ycl/domain/vo/IndexCustomerTaskVO.java
index 1cf1825..49ded56 100644
--- a/business/src/main/java/com/ycl/domain/vo/IndexCustomerTaskVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/IndexCustomerTaskVO.java
@@ -19,7 +19,7 @@
/**
* 椤圭洰id
*/
- private Long projectId;
+ private String projectId;
/**
* 椤圭洰鍚嶇О
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 87cfdd1..d7c41ac 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -399,13 +399,28 @@
taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
// 娴佺▼椤圭洰淇℃伅
- ProjectInfo project = baseMapper.getProjectInfo(task.getProcessInstanceId());
- if (Objects.nonNull(project)) {
- taskVO.setProjectId(project.getId());
- taskVO.setProjectName(project.getProjectName());
- } else {
- continue;
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .one();
+ String projectId = "";
+ String projectName = "";
+ if (Objects.nonNull(projectProcess)) {
+ if (projectProcess.getProjectType().equals(ProjectProcessTypeEnum.PROJECT)) {
+ ProjectInfo project = projectInfoMapper.selectById(projectProcess.getProjectId());
+ if (Objects.nonNull(project)) {
+ projectId = projectProcess.getProjectId();
+ projectName = project.getProjectName();
+ }
+ } else if (projectProcess.getProjectType().equals(ProjectProcessTypeEnum.ENGINEERING)) {
+ ProjectEngineering engineering = projectEngineeringMapper.selectById(projectProcess.getProjectId());
+ if (Objects.nonNull(engineering)) {
+ projectId = projectProcess.getProjectId();
+ projectName = engineering.getProjectName();
+ }
+ }
}
+ taskVO.setProjectId(projectId);
+ taskVO.setProjectName(projectName);
// 娴佺▼鍙戣捣浜轰俊鎭�
this.setPromoterInfo(taskVO);
--
Gitblit v1.8.0