From a22c582a4867ee5a3f27e89da7d20fa52008b32c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 二月 2025 10:19:39 +0800
Subject: [PATCH] 前置任务节点查出来未走的节点bug
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
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 6ce896f..1e1a777 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -204,7 +204,7 @@
identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
//娴嬭瘯瀹圭己
- variables.put("miss", true);
+ variables.put("a", 10);
// 灏嗚椤圭洰鐨勭敵璇蜂汉锛堜笟涓绘柟锛変綔涓烘祦绋嬩腑鏌愪簺鐜妭鐨勫鐞嗕汉
variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
@@ -306,9 +306,15 @@
.active()
.includeProcessVariables()
.orderByTaskCreateTime().desc();
-
+ List<String> insIds = baseMapper.getNormalInsIds();
+ if (CollectionUtils.isEmpty(insIds)) {
+ result.data(new ArrayList<>()).total(0L);
+ return;
+ } else {
+ taskQuery.processInstanceIdIn(insIds);
+ }
if (StringUtils.isNotBlank(taskName)) {
- taskQuery.processDefinitionNameLike(taskName);
+ taskQuery.taskNameLike(taskName);
}
if (!SecurityUtils.getLoginUser().getUser().isAdmin()) {
taskQuery
@@ -413,19 +419,23 @@
if (processCoding != null) {
if (StringUtils.isNotBlank(processCoding.getOvertime())) {
Long overtime = getTime(processCoding.getOvertime());
-
- long durationTime = ((new Date()).getTime() - processCoding.getStartTaskTime().getTime()) / 1000;
-
- taskVO.setRemainingTime((overtime - durationTime) / 3600 + "灏忔椂");
+ long durationTime = 0l;
+ if (Objects.nonNull(processCoding.getStartTaskTime())) {
+ durationTime = ((new Date()).getTime() - processCoding.getStartTaskTime().getTime()) / 1000;
+ } else {
+ taskVO.setRemainingTime("鏈缃姙鐞嗘椂闂�");
+ }
+ if (overtime > durationTime) {
+ taskVO.setRemainingTime((overtime - durationTime) / 3600 + "灏忔椂");
+ } else {
+ taskVO.setRemainingTime("宸茶秴鏃�");
+ }
} else {
taskVO.setRemainingTime("-");
}
}
this.distinctVo(taskVO);
vos.add(taskVO);
- }
- if (vos.size() < pageSize) {
- result.total(vos.size());
}
result.put("taskList", vos);
}
@@ -820,7 +830,7 @@
.desc();
if (StringUtils.isNotBlank(taskName)) {
- taskQuery.processDefinitionNameLike(taskName);
+ taskQuery.taskNameLike(taskName);
}
result.total(taskQuery.count());
List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
--
Gitblit v1.8.0