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 | 434 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 335 insertions(+), 99 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 4dedffa..1e1a777 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,46 +1,41 @@
package com.ycl.service.impl;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.constant.ProcessOverTimeConstants;
import com.ycl.common.core.domain.entity.SysDept;
+import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
-import com.ycl.common.enums.business.HandlerTypeEnum;
-import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
-import com.ycl.common.enums.business.TaskStatusEnum;
+import com.ycl.common.enums.business.*;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
-import com.ycl.domain.entity.ProcessCoding;
-import com.ycl.domain.entity.ProjectInfo;
-import com.ycl.domain.entity.ProjectProcess;
-import com.ycl.domain.entity.SysForm;
-import com.ycl.domain.form.TaskDelegationForm;
-import com.ycl.domain.form.TaskJumpForm;
-import com.ycl.domain.json.DelegateData;
+import com.ycl.domain.entity.*;
+import com.ycl.domain.form.*;
+import com.ycl.domain.json.*;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.IndexCustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
import com.ycl.event.event.TaskLogEvent;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.mapper.ProjectProcessMapper;
-import com.ycl.service.IFlowTaskService;
-import com.ycl.service.ISysFormService;
-import com.ycl.service.ProcessCodingService;
-import com.ycl.service.ProjectProcessService;
+import com.ycl.service.*;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.domain.form.ProjectProcessForm;
import com.ycl.domain.vo.ProjectProcessVO;
import com.ycl.domain.query.ProjectProcessQuery;
import com.ycl.service.common.TaskCommonService;
import com.ycl.system.service.ISysDeptService;
+import com.ycl.system.service.ISysDictTypeService;
import com.ycl.system.service.ISysRoleService;
import com.ycl.system.service.ISysUserService;
+import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
@@ -92,6 +87,9 @@
private final ProcessCodingService processCodingService;
private final ApplicationEventPublisher publisher;
private final ISysDeptService deptService;
+ private final ProcessLogService processLogService;
+ private final ISysDictTypeService dictTypeService;
+ private final ProcessConfigInfoService processConfigInfoService;
/**
* 鍒嗛〉鏌ヨ
@@ -142,22 +140,22 @@
}
}
ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getCreateBy)
+ .select(ProjectInfo::getProjectOwnerUnit)
.eq(ProjectInfo::getId, form.getProjectId())
.one();
if (Objects.isNull(project)) {
throw new RuntimeException("椤圭洰涓嶅瓨鍦�");
}
- SysUser user = sysUserService.selectUserById(project.getCreateBy());
- if (Objects.isNull(user)) {
+ SysDept dept = deptService.selectDeptById(project.getProjectOwnerUnit());
+ if (Objects.isNull(dept)) {
throw new RuntimeException("椤圭洰涓氫富鍗曚綅涓嶅瓨鍦�");
}
- String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId(), user.getDeptId());
+ String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId(), dept.getDeptId());
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ProjectProcess::getProjectId, form.getProjectId())
.set(ProjectProcess::getProcessDefId, form.getProcessDefId())
.set(ProjectProcess::getProcessInsId, processInsId)
- .set(ProjectProcess::getDataLaunch, project.getCreateBy())
+ .set(ProjectProcess::getDataLaunch, project.getProjectOwnerUnit())
.update();
return Result.ok("娴佺▼鍙樻洿鎴愬姛");
@@ -166,23 +164,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result startProcess(Long projectId, String processDefId) {
- ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getCreateBy)
- .eq(ProjectInfo::getId, projectId)
- .one();
+ ProjectInfo project = projectInfoMapper.selectById(projectId);
if (Objects.isNull(project)) {
throw new RuntimeException("椤圭洰涓嶅瓨鍦�");
}
- SysUser user = sysUserService.selectUserById(project.getCreateBy());
- if (Objects.isNull(user)) {
+ SysDept dept = deptService.selectDeptById(project.getProjectOwnerUnit());
+ if (Objects.isNull(dept)) {
throw new RuntimeException("椤圭洰涓氫富鍗曚綅涓嶅瓨鍦�");
}
- String processInsId = this.startPro(projectId, processDefId, user.getDeptId());
+ String processInsId = this.startPro(projectId, processDefId, dept.getDeptId());
ProjectProcess entity = new ProjectProcess();
entity.setProjectId(projectId);
entity.setProcessDefId(processDefId);
entity.setProcessInsId(processInsId);
- entity.setDataLaunch(project.getCreateBy());
+ entity.setDataLaunch(project.getProjectOwnerUnit());
baseMapper.insert(entity);
return Result.ok("娴佺▼鍚姩鎴愬姛");
@@ -209,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);
@@ -311,11 +306,17 @@
.active()
.includeProcessVariables()
.orderByTaskCreateTime().desc();
-
- if (StringUtils.isNotBlank(taskName)) {
- taskQuery.processDefinitionNameLike(taskName);
+ List<String> insIds = baseMapper.getNormalInsIds();
+ if (CollectionUtils.isEmpty(insIds)) {
+ result.data(new ArrayList<>()).total(0L);
+ return;
+ } else {
+ taskQuery.processInstanceIdIn(insIds);
}
- if (! SecurityUtils.getLoginUser().getUser().isAdmin()) {
+ if (StringUtils.isNotBlank(taskName)) {
+ taskQuery.taskNameLike(taskName);
+ }
+ if (!SecurityUtils.getLoginUser().getUser().isAdmin()) {
taskQuery
.or()
.taskCandidateGroupIn(taskCommonService.getCurrentUserGroups())
@@ -340,7 +341,7 @@
.processDefinitionId(task.getProcessDefinitionId())
.singleResult();
taskVO.setDeployId(pd.getDeploymentId());
- taskVO.setProcessName(pd.getName());
+ taskVO.setProcessName(pd.getName() + "(v" + pd.getVersion() + ")");
taskVO.setProcessInsId(task.getProcessInstanceId());
taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
@@ -408,14 +409,52 @@
}
}
}
+ // 妫�鏌ユ槸鍚︽寕璧�
+ if (processLogService.taskIsHangup(task.getId(), task.getProcessInstanceId())) {
+ taskVO.setTaskStatus(TaskStatusEnum.HANGUP);
+ }
+ // 璁＄畻鍔炵悊鏃堕棿
+ ProcessCoding processCoding = processCodingService.getByTaskId(task.getId());
+ if (processCoding != null) {
+ if (StringUtils.isNotBlank(processCoding.getOvertime())) {
+ Long overtime = getTime(processCoding.getOvertime());
+ 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);
+ }
+
+ private Long getTime(String timeStr) {
+ Long time = null;
+ if (StringUtils.isNotBlank(timeStr)) {
+ String[] timeArr = timeStr.split("-");
+ // 瑙ｆ瀽澶╂暟鍜屽皬鏃舵暟
+ int days = Integer.parseInt(timeArr[0]);
+ int hours = 0;
+ if (timeArr.length > 1) {
+ hours = Integer.parseInt(timeArr[1]);
+ }
+ time = (days * 24L + hours) * 3600L;
+// //鍒�-绉�
+// time= (days * 60L) + hours;
+ }
+ return time;
}
@Override
@@ -609,7 +648,7 @@
jsonData.setAfterHandlerIds(afterHandlerIds);
jsonData.setAfterHandlerType(form.getPeopleType());
// 鍙戝竷杞姙浜嬩欢
- publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), task.getId(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
+ publisher.publishEvent(new TaskLogEvent(this, null, SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), task.getId(), task.getName(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
return Result.ok("杞姙鎴愬姛");
}
@@ -620,7 +659,7 @@
Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
if (Objects.nonNull(task)) {
// 娣诲姞璺宠繃鏃ュ織
- publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, null));
+ publisher.publishEvent(new TaskLogEvent(this, null, SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(), ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
// 鏌ュ嚭璇ヤ换鍔＄粦瀹氱殑琛ㄥ崟
Map<String, Object> data = new HashMap<>(1);
@@ -633,6 +672,142 @@
// 瀹屾垚浠诲姟
flowTaskService.completeSubmitForm(form.getTaskId(), data);
}
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result taskSupervise(TaskSuperviseForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ SuperviseData jsonData = new SuperviseData();
+ jsonData.setCreateTime(new Date());
+ jsonData.setContent(form.getContent());
+ jsonData.setSenderId(SecurityUtils.getUserId() + "");
+ jsonData.setSenderType(HandlerTypeEnum.USER);
+ jsonData.setReceiverIds(form.getReceiverIds());
+ jsonData.setReceiverType(form.getReceiverType());
+ jsonData.setSuperviseType(form.getSuperviseType());
+ QueryWrapper<ProcessLog> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("task_id", form.getTaskId());
+ queryWrapper.eq("event_type", ProcessLogEventTypeEnum.SUPERVISE);
+ queryWrapper.eq("process_ins_id", form.getProcessInsId());
+ //鏌ヨ鐫ｅ姙鏃ュ織
+ ProcessLog processLog = processLogService.getOne(queryWrapper);
+ List<SuperviseData> dataList;
+ if (processLog != null) {
+ String eventDataJson = processLog.getEventDataJson();
+ dataList = JSONArray.parseArray(eventDataJson, SuperviseData.class);
+ } else {
+ processLog = new ProcessLog();
+ processLog.setUserId(SecurityUtils.getUserId());
+ dataList = new ArrayList<>();
+ }
+ dataList.add(jsonData);
+ //娣诲姞鐫ｅ姙鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this, processLog.getId(), processLog.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(), ProcessLogEventTypeEnum.SUPERVISE, dataList));
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ @Synchronized
+ public Result taskHangup(TaskHangupForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ if (Objects.isNull(task)) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+ List<ProcessLog> logs = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, form.getTaskId())
+ .eq(ProcessLog::getProcessInsId, form.getProcessInsId())
+ .eq(ProcessLog::getProjectId, form.getProjectId())
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.HANGUP, ProcessLogEventTypeEnum.CANCEL_HANGUP)
+ .list();
+ if (logs.size() % 2 != 0) {
+ throw new RuntimeException("璇ヤ换鍔℃鍦ㄦ寕璧蜂腑锛屼笉鑳藉啀娆℃寕璧�");
+ }
+ // 浠诲姟鎸傝捣鍙渶瑕佸瓨鏃ュ織锛屾煡璇㈠緟鍔炴椂濡傛灉鏈夎繖涓棩蹇楄褰曪紝鍒欑鐢ㄦ彁浜ゆ寜閽紝浠ユ瀹炵幇浠诲姟鎸傝捣
+ publisher.publishEvent(new TaskLogEvent(this,
+ null,
+ SecurityUtils.getUserId(),
+ form.getProjectId(),
+ form.getProcessInsId(),
+ form.getTaskId(),
+ task.getName(),
+ ProcessLogEventTypeEnum.HANGUP,
+ new HangupData(form.getReason())
+ ));
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ @Synchronized
+ public Result cancelTaskHangup(TaskHangupForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ if (Objects.isNull(task)) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+ List<ProcessLog> logs = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getTaskId, form.getTaskId())
+ .eq(ProcessLog::getProcessInsId, form.getProcessInsId())
+ .eq(ProcessLog::getProjectId, form.getProjectId())
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.HANGUP, ProcessLogEventTypeEnum.CANCEL_HANGUP)
+ .list();
+ if (logs.size() % 2 == 0) {
+ throw new RuntimeException("璇ヤ换鍔℃湭琚寕璧凤紝涓嶈兘鍙栨秷鎸傝捣");
+ }
+ publisher.publishEvent(new TaskLogEvent(this,
+ null,
+ SecurityUtils.getUserId(),
+ form.getProjectId(),
+ form.getProcessInsId(),
+ form.getTaskId(),
+ task.getName(),
+ ProcessLogEventTypeEnum.CANCEL_HANGUP,
+ new HangupData(form.getReason())
+ ));
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result taskTeamwork(TaskTeamWorkForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ if (Objects.isNull(task)) {
+ return Result.error("浠诲姟涓嶅瓨鍦�");
+ }
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ return Result.error("椤圭洰娴佺▼鏈粦瀹�");
+ }
+ // 1. 淇濆瓨鍙戣捣浜哄～鍐欑殑琛ㄥ崟鏁版嵁锛屼絾涓嶇洿鎺ュ畬鎴愯浠诲姟銆傛彁浜ゅ悗浠诲姟澶勭悊浜哄繀椤荤瓑鍒板崗鍚屼汉澶勭悊瀹屼箣鍚庢墠鑳藉畬鎴愪换鍔�
+ Map<String, Object> processVariables = new HashMap<>();
+ //鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = dictTypeService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(form.getVariables())) {
+ for (String key : form.getVariables().keySet()) {
+ newV.put(task.getTaskDefinitionKey() + "&" + key, form.getVariables().get(key));
+ //瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(dictList) && dictList.contains(key)) {
+ processVariables.put(key, form.getVariables().get(key));
+ }
+ }
+ }
+ if (!processVariables.isEmpty()) {
+ taskService.setVariables(form.getTaskId(), processVariables);
+ }
+
+ // 2. 淇濆瓨鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this,
+ null,
+ SecurityUtils.getUserId(),
+ form.getProjectId(),
+ form.getProcessInsId(),
+ form.getTaskId(),
+ task.getName(),
+ ProcessLogEventTypeEnum.TEAM_WORK,
+ new TeamWorkData(form.getHandlerType(), form.getHandlerIds(), TeamWorkStatusEnum.NOT_FINISHED)
+ ));
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -655,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);
@@ -663,6 +838,10 @@
for (Task task : taskList) {
CustomerTaskVO taskVO = new CustomerTaskVO();
this.setRuntimeTaskInfo(task, taskVO, projectId);
+ // 妫�鏌ユ槸鍚︽寕璧�
+ if (processLogService.taskIsHangup(task.getId(), task.getProcessInstanceId())) {
+ taskVO.setTaskStatus(TaskStatusEnum.HANGUP);
+ }
vos.add(taskVO);
}
result.put("taskList", vos);
@@ -671,7 +850,7 @@
/**
* 鑾峰彇鎵�鏈変换鍔�
*
- * @param projectId 椤圭洰id
+ * @param projectId 椤圭洰id
* @param processDefinitionId 娴佺▼杩愯id
* @param processInsId 娴佺▼瀹炰緥id
* @param pageNum
@@ -757,8 +936,7 @@
if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
vo.setHandlerType(HandlerTypeEnum.DEPT);
this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
- }
- else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ } else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
vo.setHandlerType(HandlerTypeEnum.DEPT);
String[] split = groupId.split(":");
if (split.length > 1) {
@@ -819,7 +997,7 @@
/**
* 鏌ヨ宸插畬鎴愮殑娴佺▼鐨勪换鍔′俊鎭�
*
- * @param userTasks 浠诲姟鑺傜偣鍒楄〃
+ * @param userTasks 浠诲姟鑺傜偣鍒楄〃
* @param processInsId 娴佺▼瀹炰緥id
* @param processDefId 娴佺▼瀹氫箟id
* @return
@@ -866,8 +1044,8 @@
/**
* 璁剧疆杩愯鏃朵换鍔＄殑淇℃伅
*
- * @param task 浠诲姟
- * @param taskVO 浠诲姟vo
+ * @param task 浠诲姟
+ * @param taskVO 浠诲姟vo
* @param projectId 椤圭洰id
*/
private void setRuntimeTaskInfo(Task task, CustomerTaskVO taskVO, Long projectId) {
@@ -966,8 +1144,8 @@
List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInsId)
.finished()
- .includeIdentityLinks()
.list();
+ hisTaskList = this.distinctHisTask(hisTaskList);
if (CollectionUtils.isEmpty(hisTaskList)) {
return 0L;
}
@@ -975,20 +1153,24 @@
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
- List<ProcessCoding> taskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, hisTaskKeys)
.list();
- Map<String, ProcessCoding> codingMap = taskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<HistoricTaskInstance> finishedTaskList = new ArrayList<>();
// 鍒ゆ柇
for (String key : hisTaskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
+ List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
// 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (Objects.isNull(processCoding)) {
+ if (CollectionUtils.isEmpty(targetProcessCodings)) {
finishedTaskList.add(hisTaskMap.get(key));
- } else if (ProcessOverTimeConstants.NORMAL.equals(processCoding.getOvertimeStatus()) || StringUtils.isBlank(processCoding.getOvertimeStatus())) {
- finishedTaskList.add(hisTaskMap.get(key));
+ } else {
+ // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
+ targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
+ ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
+ if (ProcessOverTimeConstants.NORMAL.equals(latestProjectProcess.getOvertimeStatus()) || StringUtils.isBlank(latestProjectProcess.getOvertimeStatus())) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ }
}
}
return Long.valueOf(finishedTaskList.size());
@@ -998,8 +1180,8 @@
* 鏌ヨ鎸夋椂瀹屾垚鐨勪换鍔�
*
* @param processDefinitionId 娴佺▼瀹氫箟id
- * @param processInsId 娴佺▼瀹炰緥id
- * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
* @param pageNum
* @param pageSize
* @param result
@@ -1024,22 +1206,26 @@
}
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
+ Map<String, HistoricTaskInstance> hisTaskMap = this.distinctHisTask(hisTaskList).stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
- List<ProcessCoding> taskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, hisTaskKeys)
.list();
- Map<String, ProcessCoding> codingMap = taskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<HistoricTaskInstance> finishedTaskList = new ArrayList<>();
// 鍒ゆ柇
for (String key : hisTaskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
+ List<ProcessCoding> targetProcessCodings = codeList.stream().filter(code -> key.equals(code.getTaskDefKey())).collect(Collectors.toList());
// 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
- if (Objects.isNull(processCoding)) {
+ if (CollectionUtils.isEmpty(targetProcessCodings)) {
finishedTaskList.add(hisTaskMap.get(key));
- } else if (ProcessOverTimeConstants.NORMAL.equals(processCoding.getOvertimeStatus()) || StringUtils.isBlank(processCoding.getOvertimeStatus())) {
- finishedTaskList.add(hisTaskMap.get(key));
+ } else {
+ // 鎸夌収鏃堕棿闄嶅簭鎺掑垪
+ targetProcessCodings.sort(Comparator.comparing(ProcessCoding::getGmtCreate).reversed());
+ ProcessCoding latestProjectProcess = targetProcessCodings.get(0);
+ if (ProcessOverTimeConstants.NORMAL.equals(latestProjectProcess.getOvertimeStatus()) || StringUtils.isBlank(latestProjectProcess.getOvertimeStatus())) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ }
}
}
@@ -1117,6 +1303,27 @@
return vos;
}
+ /**
+ * 鏍规嵁浠诲姟key鍘婚噸鍘嗗彶浠诲姟锛岀浉鍚屾儏鍐典笅鍙栨渶鏂扮殑涓�鏉�
+ *
+ * @param hisTaskList
+ * @return
+ */
+ private List<HistoricTaskInstance> distinctHisTask(List<HistoricTaskInstance> hisTaskList) {
+ Map<String, HistoricTaskInstance> uniqueTasks = new HashMap<>();
+ for (HistoricTaskInstance task : hisTaskList) {
+ String taskDefinitionKey = task.getTaskDefinitionKey();
+ HistoricTaskInstance existingTask = uniqueTasks.get(taskDefinitionKey);
+
+ // 濡傛灉浠诲姟key閲嶅锛堝彲鑳借椹冲洖杩囷紝閲嶆柊鎻愪氦瀵艰嚧key閲嶅锛夛紝鍙栨渶杩戠殑涓�鏉�
+ if (existingTask == null || task.getCreateTime().after(existingTask.getCreateTime())) {
+ uniqueTasks.put(taskDefinitionKey, task);
+ }
+ }
+ // 鏈�缁堝幓閲嶅悗鐨勪换鍔″垪琛�
+ return new ArrayList<>(uniqueTasks.values());
+ }
+
/**
* 缁熻瓒呮椂鐨勪换鍔℃暟
@@ -1134,31 +1341,36 @@
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> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, taskKeys)
.list();
- Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<Task> tList = new ArrayList<>();
// 鍒ゆ柇
for (String key : taskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
- // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻瓒呮椂
- if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.OVERTIME.equals(processCoding.getOvertimeStatus())) {
+ 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());
}
/**
* 鏌ヨ瓒呮椂鐨勪换鍔�
*
- * @param projectId 椤圭洰id
+ * @param projectId 椤圭洰id
* @param processDefinitionId 娴佺▼瀹氫箟id
- * @param processInsId 娴佺▼瀹炰緥id
- * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
* @param pageNum
* @param pageSize
* @param result
@@ -1182,18 +1394,24 @@
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> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, taskKeys)
.list();
- Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<Task> tList = new ArrayList<>();
// 鍒ゆ柇
for (String key : taskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
- // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻瓒呮椂
- if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.OVERTIME.equals(processCoding.getOvertimeStatus())) {
+ 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));
+ }
}
}
@@ -1236,18 +1454,24 @@
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> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, taskKeys)
.list();
- Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<Task> tList = new ArrayList<>();
// 鍒ゆ柇
for (String key : taskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
- // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻鍗冲皢瓒呮椂
- if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.WILLOVERTIME.equals(processCoding.getOvertimeStatus())) {
+ 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.WILLOVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
}
}
return Long.valueOf(tList.size());
@@ -1256,10 +1480,10 @@
/**
* 鏌ヨ鍗冲皢瓒呮椂鐨勪换鍔�
*
- * @param projectId 椤圭洰id
+ * @param projectId 椤圭洰id
* @param processDefinitionId 娴佺▼瀹氫箟id
- * @param processInsId 娴佺▼瀹炰緥id
- * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
* @param pageNum
* @param pageSize
* @param result
@@ -1283,18 +1507,24 @@
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> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
.in(ProcessCoding::getTaskDefKey, taskKeys)
.list();
- Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<Task> tList = new ArrayList<>();
// 鍒ゆ柇
for (String key : taskMap.keySet()) {
- ProcessCoding processCoding = codingMap.get(key);
- // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻鍗冲皢瓒呮椂
- if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.WILLOVERTIME.equals(processCoding.getOvertimeStatus())) {
+ 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.WILLOVERTIME.equals(latestProjectProcess.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
}
}
@@ -1325,7 +1555,7 @@
/**
* 鏌ヨ鍓╀綑浜嬮」锛堟湭寮�濮嬬殑浠诲姟锛�
*
- * @param projectId 椤圭洰id
+ * @param projectId 椤圭洰id
* @param processDefinitionId
* @param processInsId
* @param taskName
@@ -1371,7 +1601,6 @@
List<UserTask> userTasks = allUserTaskElement.subList(startNum, end);
-
// 鍒ゆ柇浠诲姟鐘舵�侊紝鏋勫缓vo
List<CustomerTaskVO> vos = new ArrayList<>(48);
for (UserTask userTask : userTasks) {
@@ -1411,8 +1640,7 @@
if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
vo.setHandlerType(HandlerTypeEnum.DEPT);
this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
- }
- else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ } else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
vo.setHandlerType(HandlerTypeEnum.DEPT);
String[] split = groupId.split(":");
if (split.length > 1) {
@@ -1537,7 +1765,7 @@
if (TaskStatusEnum.TODO.equals(taskVO.getTaskStatus())) {
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(taskVO.getTaskId());
for (IdentityLink identityLink : identityLinksForTask) {
- if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
+ if (StringUtils.isBlank(((IdentityLinkEntityImpl) identityLink).getId())) {
continue;
}
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
@@ -1632,7 +1860,7 @@
.orderByHistoricTaskInstanceStartTime()
.desc()
.list(); // 涔嬫墍浠ョ敤list鏄洜涓哄鏋滄煇涓换鍔¤椹冲洖杩囷紝涓斿鏋滆浠诲姟鍐嶆鎵ц鏃朵細鏈夊鏉℃暟鎹紝鍙栨渶鏂扮殑涓�鏉�
- if (! CollectionUtils.isEmpty(historicTaskInstances)) {
+ if (!CollectionUtils.isEmpty(historicTaskInstances)) {
// 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
String assignee = historicTaskInstances.get(0).getAssignee();
SysUser startUser = sysUserService.selectUserById(Long.parseLong(assignee));
@@ -1645,10 +1873,18 @@
taskVO.setPromoterName("鏆傛棤");
taskVO.setPromoterUnitName("鏆傛棤");
} else {
- taskVO.setPromoterId(userList.stream().map(user -> { return user.getUserId() + ""; }).collect(Collectors.joining("銆�")));
- taskVO.setPromoterName(userList.stream().map(user -> { return user.getNickName(); }).collect(Collectors.joining("銆�")));
- taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> { return user.getDept().getDeptId() + "";}).collect(Collectors.joining("銆�")));
- taskVO.setPromoterUnitName(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> { return user.getDept().getDeptName() + "";}).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterId(userList.stream().map(user -> {
+ return user.getUserId() + "";
+ }).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterName(userList.stream().map(user -> {
+ return user.getNickName();
+ }).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
+ return user.getDept().getDeptId() + "";
+ }).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterUnitName(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
+ return user.getDept().getDeptName() + "";
+ }).collect(Collectors.joining("銆�")));
}
}
--
Gitblit v1.8.0