From c5dafd7dba14635643b4340597fb14c563c8dc7e Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 14 二月 2025 15:59:17 +0800 Subject: [PATCH] 挂起任务接口 --- business/src/main/java/com/ycl/task/FlowableTask.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java index 9112494..b5eb3ec 100644 --- a/business/src/main/java/com/ycl/task/FlowableTask.java +++ b/business/src/main/java/com/ycl/task/FlowableTask.java @@ -42,7 +42,7 @@ public void expireTask() { log.info("寮�濮嬭祴鐮�"); //褰撳墠姝e湪杩愯鐨勬墍鏈変换鍔¤妭鐐� - List<Task> taskList = taskService.createTaskQuery().list(); + List<Task> taskList = taskService.createTaskQuery().active().list(); if (CollectionUtils.isEmpty(taskList)) return; List<String> taskIds = taskList.stream().map(TaskInfo::getId).collect(Collectors.toList()); //闇�瑕佺洃鎺х殑璧嬬爜浠诲姟 @@ -91,9 +91,13 @@ String overtimeStatus = NORMAL; if (overtime != null && overtime !=0 && durationDay >= overtime) { overtimeStatus = OVERTIME; // 濡傛灉瓒呰繃鍔炵悊鏈熼檺 - } else if (overtime != null && overtime != 0 && durationDay >= (overtime - 12 * 60 * 60)) { + } + else if (overtime != null && overtime != 0 && durationDay >= (overtime - 12 * 60 * 60)) { overtimeStatus = WILLOVERTIME; // 濡傛灉涓存湡(鍥哄畾瓒呮椂鍓�12灏忔椂涓轰复鏈�) } +// else if (overtime != null && overtime != 0 && durationDay >= (overtime - 60)) { +// overtimeStatus = WILLOVERTIME; // 濡傛灉涓存湡(鍥哄畾瓒呮椂鍓�12灏忔椂涓轰复鏈�) +// } List<String> processInsIds = map.get(status); processInsIds.add(task.getProcessInstanceId()); @@ -123,6 +127,8 @@ hours = Integer.parseInt(timeArr[1]); } time = (days * 24L + hours) * 3600L; +// //鍒�-绉� +// time= (days * 60L) + hours; } return time; } -- Gitblit v1.8.0