From 74da9dfb5fb4085d8847d4c74a97048c6c677514 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 一月 2025 10:53:34 +0800
Subject: [PATCH] 完成任务bug(协同办理的才resolveTask)、转办前如果是指定人员删除不掉问题、提取获取运行时任务信息的方法
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index 485553f..0b762c0 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -9,6 +9,7 @@
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.core.domain.AjaxResult;
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.FlowComment;
@@ -33,9 +34,7 @@
import com.ycl.service.ISysDeployFormService;
import com.ycl.service.ISysFormService;
import com.ycl.service.common.TaskCommonService;
-import com.ycl.system.service.ISysDeptService;
-import com.ycl.system.service.ISysRoleService;
-import com.ycl.system.service.ISysUserService;
+import com.ycl.system.service.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -90,6 +89,7 @@
private final ISysUserService sysUserService;
private final ISysRoleService sysRoleService;
private final ISysDeptService sysDeptService;
+ private final ISysDictTypeService sysDictDService;
private final ISysDeployFormService sysInstanceFormService;
private final ISysFormService sysFormService;
private final TaskCommonService taskCommonService;
@@ -134,22 +134,30 @@
if (Objects.isNull(task)) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
+
+ Map<String, Object> processVariables = new HashMap<>();
+ //鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = sysDictDService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
Map<String, Object> newV = new HashMap<>(2);
if (!org.springframework.util.CollectionUtils.isEmpty(variables)) {
for (String key : variables.keySet()) {
newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key));
+ //瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
+ if (!CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ processVariables.put(key,variables.get(key));
+ }
}
}
+ //娣诲姞娴佺▼鍙橀噺
+ if(!processVariables.isEmpty()) taskService.setVariables(taskId,processVariables);
taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
- // 鍒ゆ柇褰撳墠浠诲姟鏄笉鏄浆鍔炶繃鐨�
- Boolean delegation = flowLogService.taskDelegation(task.getProcessInstanceId(), task.getId());
- if (delegation) {
+ if (DelegationState.PENDING.equals(task.getDelegationState())) {
taskService.resolveTask(taskId, newV);
+ } else {
+ // 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
+ taskService.claim(taskId, SecurityUtils.getUserId() + "");
+ taskService.complete(taskId, newV);
}
- // 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
- taskService.claim(taskId, SecurityUtils.getUserId() + "");
- taskService.complete(taskId, newV);
-
return AjaxResult.success("鎻愪氦鎴愬姛");
}
@@ -865,18 +873,19 @@
flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis()));
//鎵╁睍 鍒ゆ柇鏄惁瓒呮椂
ProcessCoding processCoding = processCodingMap.get(histIns.getTaskId());
- if(processCoding!=null){
+ if (processCoding != null) {
//閫氳繃鑰楁椂鍒ゆ柇鏄惁鏄唬鍔炶妭鐐�
//濡傛灉浠诲姟鏄唬鍔炶妭鐐�
if (flowTask.getDuration() == null) {
- if(RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus())){
+ if (RED.equals(processCoding.getStatus()) || YELLOW.equals(processCoding.getStatus())) {
flowTask.setOvertime(processCoding.getStatus());
}
- }else {
+ } else {
//濡傛灉浠诲姟鑺傜偣灞炰簬鍘嗗彶鑺傜偣
- if(RED.equals(processCoding.getStatus())){
+ if (RED.equals(processCoding.getStatus())) {
flowTask.setOvertime(processCoding.getStatus());
- };
+ }
+ ;
}
}
// 鑾峰彇鎰忚璇勮鍐呭
@@ -1290,10 +1299,16 @@
List<JSONObject> oldFields = JSON.parseObject(JSON.toJSONString(formJson.get(ProcessConstants.WIDGET_LIST)), new TypeReference<List<JSONObject>>() {
});
- // 璁剧疆宸插～鍐欑殑琛ㄥ崟涓虹鐢ㄧ姸鎬�
- for (JSONObject oldField : oldFields) {
- JSONObject options = oldField.getJSONObject("options");
- options.put("disabled", true);
+ if(CollectionUtils.isNotEmpty(oldFields)) {
+ // 璁剧疆宸插～鍐欑殑琛ㄥ崟涓虹鐢ㄧ姸鎬�
+ for (JSONObject oldField : oldFields) {
+ JSONObject options = oldField.getJSONObject("options");
+ options.put("disabled", true);
+ }
+ formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
+ newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
+ newP.remove(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
+ formDetailVO.setFormJsonObj(newP);
}
// TODO 鏆傛椂鍙鐞嗙敤鎴蜂换鍔′笂鐨勮〃鍗�
// if (StringUtils.isNotBlank(task.getFormKey())) {
@@ -1313,10 +1328,7 @@
// }
// oldFields.addAll(newFields);
// }
- formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
- newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
- newP.remove(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
- formDetailVO.setFormJsonObj(newP);
+
}
}
return beforeNodes;
--
Gitblit v1.8.0