From 1698792d4299a0b81b9695d8a56e3d3088c7a7ee Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 31 三月 2025 11:39:50 +0800
Subject: [PATCH] 超时计算排除节假日，超时统计调整
---
common/src/main/java/com/ycl/common/utils/DateUtils.java | 52 +++++++
common/src/main/java/com/ycl/common/enums/business/TaskStatusEnum.java | 2
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 253 +++++++++++++++++++++++++++++------------
business/src/main/java/com/ycl/task/FlowableTask.java | 7
4 files changed, 231 insertions(+), 83 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 65cbd42..c4fdcc2 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -13,6 +13,7 @@
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.business.*;
+import com.ycl.common.utils.DateUtils;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
import com.ycl.domain.entity.*;
@@ -435,7 +436,7 @@
Long overtime = getTime(processCoding.getRedTime());
long durationTime = 0l;
if (Objects.nonNull(processCoding.getStartTaskTime())) {
- durationTime = ((new Date()).getTime() - processCoding.getStartTaskTime().getTime()) / 1000;
+ durationTime = DateUtils.getWorkingSed(processCoding.getStartTaskTime(), new Date());
}
if (overtime > durationTime) {
order.setNum((overtime - durationTime) / 3600);
@@ -1616,6 +1617,81 @@
}
/**
+ * 璁剧疆鍘嗗彶浠诲姟淇℃伅
+ *
+ * @param hisTask
+ * @param vo
+ * @param projectId
+ * @param processInsId
+ */
+ private void setHisTaskInfo(HistoricTaskInstance hisTask, CustomerTaskVO vo, String projectId, String processInsId) {
+ // 鏌ュ嚭娴佺▼
+ ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ String deployId = "";
+ String processName = "";
+ String processDefinitionId = "";
+ if (Objects.nonNull(process)) {
+ deployId = process.getDeploymentId();
+ processName = process.getProcessDefinitionName();
+ processDefinitionId = process.getProcessDefinitionId();
+ } else {
+ HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ deployId = hisProcess.getDeploymentId();
+ processName = hisProcess.getProcessDefinitionName();
+ processDefinitionId = hisProcess.getProcessDefinitionId();
+ }
+
+ vo.setProcessInsId(processInsId);
+ vo.setProcessDefId(processDefinitionId);
+ vo.setDeployId(deployId);
+ vo.setTaskName(hisTask.getName());
+ vo.setProcessName(processName);
+
+ // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
+ List<Long> handlerIds = new ArrayList<>(2);
+ List<String> handlerNames = new ArrayList<>(2);
+ List<Long> handlerUnitIds = new ArrayList<>(2);
+ List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
+ vo.setHandlerId(handlerIds);
+ vo.setHandlerName(handlerNames);
+ vo.setHandlerUnitId(handlerUnitIds);
+ vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
+ List<UserTask> targetUserTasks = this.getAllUserTaskElement(processDefinitionId).stream().filter(userTask -> hisTask.getTaskDefinitionKey().equals(userTask.getId())).collect(Collectors.toList());
+ UserTask userTask = null;
+ if (! CollectionUtils.isEmpty(targetUserTasks)) {
+ userTask = targetUserTasks.get(0);
+ }
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
+
+
+ vo.setTaskStatus(TaskStatusEnum.FINISHED);
+ // 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
+ vo.setTaskId(hisTask.getId());
+ vo.setExecutionId(hisTask.getExecutionId());
+ vo.setCreateTime(hisTask.getStartTime());
+
+ // 鏌ヨ瀹為檯澶勭悊浜�
+ if (StringUtils.isNotBlank(hisTask.getAssignee())) {
+ long handlerUserId = Long.parseLong(hisTask.getAssignee());
+ SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
+ if (Objects.nonNull(handlerUser)) {
+ vo.getHandlerId().add(handlerUserId);
+ vo.getHandlerName().add(this.getUserShowName(handlerUser));
+ if (Objects.nonNull(handlerUser.getDept())) {
+ vo.getHandlerUnitId().add(handlerUser.getDept().getDeptId());
+ vo.getHandlerUnitName().add(handlerUser.getDept().getDeptName());
+ }
+ }
+ }
+ vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
+ this.distinctVo(vo);
+ }
+
+ /**
* 鐢ㄦ埛鍚嶇О鍚庨潰璺熺數璇濆彿鐮�
*
* @param user
@@ -1664,36 +1740,16 @@
* @return
*/
private Long getOvertimeTaskNum(String processInsId) {
- // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
- List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInsId).list();
-
- if (CollectionUtils.isEmpty(taskList)) {
+ // 鏌ュ嚭宸茶秴鏃剁殑浠诲姟id
+ List<ProcessCoding> overtimeRecords = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+ .orderByDesc(ProcessCoding::getGmtCreate)
+ .list();
+ if (CollectionUtils.isEmpty(overtimeRecords)) {
return 0L;
}
- List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
- // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
- List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .in(ProcessCoding::getTaskDefKey, taskKeys)
- .list();
- List<Task> tList = new ArrayList<>();
- // 鍒ゆ柇
- for (String key : taskMap.keySet()) {
- List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
- // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (CollectionUtils.isEmpty(targetProcessCodings)) {
- tList.add(taskMap.get(key));
- } else {
- // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
- targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
- ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
- if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
- tList.add(taskMap.get(key));
- }
- }
- }
- return Long.valueOf(taskList.size());
+ return Long.valueOf(overtimeRecords.size());
}
/**
@@ -1712,63 +1768,108 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
- // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
- List<Task> taskList = new ArrayList<>(12);
- if (StringUtils.isNotBlank(taskName)) {
- taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
- } else {
- taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
- }
- if (CollectionUtils.isEmpty(taskList)) {
+ // 鏌ュ嚭宸茶秴鏃剁殑浠诲姟id
+ List<ProcessCoding> overtimeRecords = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+ .orderByDesc(ProcessCoding::getGmtCreate)
+ .list();
+ if (CollectionUtils.isEmpty(overtimeRecords)) {
result.total(0);
return new ArrayList<>();
}
- List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
- // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
- List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .in(ProcessCoding::getTaskDefKey, taskKeys)
- .list();
- List<Task> tList = new ArrayList<>();
- // 鍒ゆ柇
- for (String key : taskMap.keySet()) {
- List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
- // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (CollectionUtils.isEmpty(targetProcessCodings)) {
- tList.add(taskMap.get(key));
- } else {
- // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
- targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
- ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
- if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
- tList.add(taskMap.get(key));
- }
- }
- }
-
- if (startNum >= tList.size()) {
+ if (startNum >= overtimeRecords.size()) {
// 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
return new ArrayList<>();
}
- result.total(tList.size());
- int end = Math.min(endNum, tList.size());
- List<Task> pageTaskList = tList.subList(startNum, end);
- List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
- Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ result.total(overtimeRecords.size());
+ int end = Math.min(endNum, overtimeRecords.size());
+ List<ProcessCoding> pageOvertimeRecords = overtimeRecords.subList(startNum, end);
- // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
- List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
-
- // 鏌ヨ浠诲姟鐩稿叧淇℃伅
- List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
- Task task = keyMap.get(userTask.getId());
+ List<CustomerTaskVO> vos = pageOvertimeRecords.stream().map(record -> {
CustomerTaskVO vo = new CustomerTaskVO();
- this.setRuntimeTaskInfo(task, vo, projectId);
- return vo;
- }).collect(Collectors.toList());
+ Task task = taskService.createTaskQuery().processInstanceId(processInsId).taskId(record.getTaskId()).singleResult();
+ if (Objects.nonNull(task)) {
+ this.setRuntimeTaskInfo(task, vo, projectId);
+ vo.setTaskStatus(TaskStatusEnum.OVER_TIME);
+ return vo;
+ } else {
+ List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery()
+ .finished()
+ .processInstanceId(processInsId)
+ .taskId(record.getTaskId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(list)) {
+ return null;
+ }
+ List<HistoricTaskInstance> hisTask = this.distinctHisTask(list);
+ this.setHisTaskInfo(hisTask.get(0), vo, projectId, processInsId);
+ vo.setTaskStatus(TaskStatusEnum.OVER_TIME_FINISHED);
+ return vo;
+ }
+ }).filter(Objects::nonNull).collect(Collectors.toList());
result.data(vos);
return vos;
+
+// // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+// List<Task> taskList = new ArrayList<>(12);
+// if (StringUtils.isNotBlank(taskName)) {
+// taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
+// } else {
+// taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
+// }
+// if (CollectionUtils.isEmpty(taskList)) {
+// result.total(0);
+// return new ArrayList<>();
+// }
+// List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+// Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+// // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+// List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+// .eq(ProcessCoding::getProcessInsId, processInsId)
+// .in(ProcessCoding::getTaskDefKey, taskKeys)
+// .list();
+// List<Task> tList = new ArrayList<>();
+// // 鍒ゆ柇
+// for (String key : taskMap.keySet()) {
+// List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
+// // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
+// if (CollectionUtils.isEmpty(targetProcessCodings)) {
+// tList.add(taskMap.get(key));
+// } else {
+// // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
+// targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
+// ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
+// if (Objects.nonNull(latestProjectProcess) && ProcessOverTimeConstants.OVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
+// tList.add(taskMap.get(key));
+// }
+// }
+// }
+//
+// if (startNum >= tList.size()) {
+// // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+// return new ArrayList<>();
+// }
+// result.total(tList.size());
+// int end = Math.min(endNum, tList.size());
+// List<Task> pageTaskList = tList.subList(startNum, end);
+// List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+// Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+//
+// // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
+// List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
+//
+// // 鏌ヨ浠诲姟鐩稿叧淇℃伅
+// List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
+// Task task = keyMap.get(userTask.getId());
+// CustomerTaskVO vo = new CustomerTaskVO();
+// this.setRuntimeTaskInfo(task, vo, projectId);
+// return vo;
+// }).collect(Collectors.toList());
+// result.data(vos);
+// return vos;
}
/**
diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java
index d6c0e5f..9055d47 100644
--- a/business/src/main/java/com/ycl/task/FlowableTask.java
+++ b/business/src/main/java/com/ycl/task/FlowableTask.java
@@ -5,6 +5,7 @@
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;
@@ -111,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锛氬噺鍘绘祦绋嬫寕璧锋椂闀�
//鍑忓幓鑺傜偣鎸傝捣鏃堕暱
diff --git a/common/src/main/java/com/ycl/common/enums/business/TaskStatusEnum.java b/common/src/main/java/com/ycl/common/enums/business/TaskStatusEnum.java
index caa490a..5b38a2f 100644
--- a/common/src/main/java/com/ycl/common/enums/business/TaskStatusEnum.java
+++ b/common/src/main/java/com/ycl/common/enums/business/TaskStatusEnum.java
@@ -18,6 +18,8 @@
WAIT("wait", "瀹圭己"),
HANGUP("HANGUP", "鎸傝捣"),
JUMP("JUMP", "璺宠繃"),
+ OVER_TIME("OVER_TIME", "瓒呮椂鏈畬鎴�"),
+ OVER_TIME_FINISHED("OVER_TIME_FINISHED", "瓒呮椂宸插畬鎴�"),
;
private final String value;
diff --git a/common/src/main/java/com/ycl/common/utils/DateUtils.java b/common/src/main/java/com/ycl/common/utils/DateUtils.java
index 3780ccc..e6de789 100644
--- a/common/src/main/java/com/ycl/common/utils/DateUtils.java
+++ b/common/src/main/java/com/ycl/common/utils/DateUtils.java
@@ -4,11 +4,7 @@
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
import java.util.Date;
import java.util.HashSet;
import java.util.Objects;
@@ -80,6 +76,52 @@
return workingHours;
}
+ /**
+ * 鑾峰彇涓や釜鏃堕棿鍐咃紝闄ゅ幓鍛ㄦ湯鍛ㄦ棩浠ュ強娉曞畾鑺傚亣鏃ョ殑 绉掓�绘暟銆�
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public static long getWorkingSed(Date startDate,Date endDate){
+
+ long workingHours = 0;
+ long workingMill = 0;
+ //杞崲鏃ユ湡鏍煎紡
+ LocalDateTime startTime = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ LocalDateTime endTime = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ if(startTime.isAfter(endTime)){
+ throw new RuntimeException("寮�濮嬫椂闂翠笉鑳芥櫄浜庣粨鏉熸椂闂�");
+ }
+ LocalDateTime varTime = startTime;
+ //鑺傚亣鏃ユ棩鏈�(2025涓哄垪)
+ Set<LocalDate> holidays = new HashSet<>();
+ String[] holiday = isHoliday.split(",");
+ for (String str : holiday) {
+ String[] md = str.split("-");
+ int month = Integer.parseInt(md[0]);
+ int day = Integer.parseInt(md[1]);
+ holidays.add(LocalDate.of(2025,month,day));
+ }
+ while (varTime.isBefore(endTime)){
+ boolean isWorkDay = varTime.getDayOfWeek().getValue() < 6
+ && !holidays.contains(varTime.toLocalDate());
+ long diffMill = endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - varTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ // 鍒ゆ柇鏄惁鏄伐浣滄棩锛堥潪鍛ㄦ湯 + 闈炶妭鍋囨棩锛�
+ if (isWorkDay){
+ if (diffMill < 3600000) {
+ // 濡傛灉涓や釜鏃堕棿涓嶅埌涓�灏忔椂宸窛
+ workingMill += diffMill;
+ break;
+ }
+ workingHours++;
+ workingMill += 3600000;
+ }
+
+ varTime = varTime.plusHours(1);
+ }
+ return workingMill / 1000;
+ }
+
/**
* 鑾峰彇褰撳墠Date鍨嬫棩鏈�
--
Gitblit v1.8.0