From 7b1da9b7db15333148fbf12a6ac3f1122238b2ab Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 05 六月 2025 09:05:11 +0800
Subject: [PATCH] 数据库备份
---
business/src/main/java/com/ycl/task/FlowableTask.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java
index 02c1455..f130f86 100644
--- a/business/src/main/java/com/ycl/task/FlowableTask.java
+++ b/business/src/main/java/com/ycl/task/FlowableTask.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
+import com.ycl.common.enums.business.ProjectProcessTypeEnum;
+import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.ProcessCoding;
import com.ycl.domain.entity.ProcessLog;
import com.ycl.domain.entity.ProjectInfo;
@@ -70,7 +72,7 @@
//鏌ヨ鑺傜偣鎸傝捣鏃ュ織
Map<String, List<ProcessLog>> hangupLogMap = new LambdaQueryChainWrapper<>(processLogMapper)
.in(ProcessLog::getEventType, HANGUP, CANCEL_HANGUP)
- .in(ProcessLog::getProcessInsId, taskIds)
+ .in(ProcessLog::getTaskId, taskIds)
.list()
.stream()
.collect(Collectors.groupingBy(ProcessLog::getTaskId));
@@ -110,8 +112,10 @@
// Long yellowTime = getTime(processCoding.getYellowTime());
// Long overtime = getTime(processCoding.getOvertime());
if (startTime == null) continue;
- //鑺傜偣澶勭悊鏃堕棿
- long durationTime = (now.getTime() - startTime.getTime()) / 1000;
+
+ //鑺傜偣澶勭悊鏃堕棿锛岄渶鎺掗櫎鑺傚亣鏃�
+ long durationTime = DateUtils.getWorkingSed(startTime, now);
+
//TODO锛氬噺鍘绘祦绋嬫寕璧锋椂闀�
//鍑忓幓鑺傜偣鎸傝捣鏃堕暱
@@ -214,10 +218,11 @@
return;
}
- List<Long> projectIds = projectProcessMapper.selectList(
- new QueryWrapper<ProjectProcess>()
- .in("process_ins_id", processInstanceIds)
- ).stream()
+ List<String> projectIds = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .in(ProjectProcess::getProcessInsId, processInstanceIds)
+ .eq(ProjectProcess::getProjectType, ProjectProcessTypeEnum.PROJECT)
+ .list()
+ .stream()
.map(ProjectProcess::getProjectId)
.collect(Collectors.toList());
--
Gitblit v1.8.0