From 7ffa0f92413da168a73394b02e06b760778da05c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 10 二月 2025 10:08:49 +0800
Subject: [PATCH] 办理期限
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 94 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 48 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 26a400d..e0ff79b 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;
@@ -28,13 +29,12 @@
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.flow.FlowableUtils;
import com.ycl.mapper.ProcessCodingMapper;
+import com.ycl.service.ProcessLogService;
import com.ycl.service.IFlowTaskService;
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;
@@ -64,7 +64,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
@@ -89,10 +88,12 @@
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;
private final ProcessCodingMapper processCodingMapper;
+ private final ProcessLogService processLogService;
/**
* 瀹屾垚瀹℃牳浠诲姟
@@ -132,21 +133,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 (ProcessConstants.TASK_FORM_KEY.equals(key)) {
-// newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.TASK_FORM_KEY, variables.get(key));
-// } else if (ProcessConstants.WIDGET_LIST.equals(key)){
-// newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.WIDGET_LIST, variables.get(key));
-// }
+ //瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
+ if (!CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ processVariables.put(key,variables.get(key));
+ }
}
}
- // 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
- taskService.claim(taskId, SecurityUtils.getUserId() + "");
+ //娣诲姞娴佺▼鍙橀噺
+ if(!processVariables.isEmpty()) taskService.setVariables(taskId,processVariables);
taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
- taskService.complete(taskId, newV);
+ if (DelegationState.PENDING.equals(task.getDelegationState())) {
+ taskService.resolveTask(taskId, newV);
+ } else {
+ // 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
+ taskService.claim(taskId, SecurityUtils.getUserId() + "");
+ taskService.complete(taskId, newV);
+ }
return AjaxResult.success("鎻愪氦鎴愬姛");
}
@@ -790,7 +800,7 @@
* @return
*/
@Override
- public AjaxResult flowRecord(String procInsId, String deployId) {
+ public AjaxResult flowRecord(String procInsId) {
Map<String, Object> map = new HashMap<String, Object>();
if (StringUtils.isNotBlank(procInsId)) {
List<HistoricActivityInstance> list = historyService
@@ -798,7 +808,6 @@
.processInstanceId(procInsId)
.orderByHistoricActivityInstanceStartTime()
.desc().list();
- Date now = new Date();
//鎵╁睍 鑾峰彇杩欎釜娴佺▼瀹炰緥鐨勭洃鎺т俊鎭� key:TaskId value:瀹炰綋绫�
Map<String, ProcessCoding> processCodingMap = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>().eq("process_ins_id", procInsId))
.stream()
@@ -863,17 +872,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());
- };
+ }
+ ;
}
}
// 鑾峰彇鎰忚璇勮鍐呭
@@ -1129,8 +1140,9 @@
.finished()
.list();
- //鑾峰彇杩欎釜娴佺▼瀹炰緥鐨勭洃鎺т俊鎭� key:TaskId value:瀹炰綋绫�
- Map<String, ProcessCoding> processCodingMap = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>().eq("process_ins_id", procInsId))
+ //鎵╁睍 鑾峰彇杩欎釜娴佺▼瀹炰緥鐨勭洃鎺т俊鎭� key:TaskId value:瀹炰綋绫�
+ Map<String, ProcessCoding> processCodingMap = processCodingMapper
+ .selectList(new QueryWrapper<ProcessCoding>().eq("process_ins_id", procInsId))
.stream()
.collect(Collectors.toMap(ProcessCoding::getTaskId, Function.identity()));
// 淇濆瓨宸茬粡瀹屾垚鐨勬祦绋嬭妭鐐圭紪鍙�
@@ -1231,30 +1243,13 @@
*
* @param parameters 鏍规嵁浠诲姟鏌ユ壘鍑烘潵鐨勫弬鏁�
* @param formKey task鑷韩鍏宠仈鐨勮〃鍗昳d
- * @param taskName task鑷韩鐨勪换鍔″悕
+ * @param taskName 浠诲姟
* @param processDefId 娴佺▼瀹氫箟id
* @param processDefKey 娴佺▼瀹炰緥id
* @return
*/
private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters, String formKey, String taskName, String processDefId, String processDefKey, Boolean currentNeedData) {
- if (!parameters.keySet().stream().anyMatch(key -> key.contains(ProcessConstants.TASK_FORM_KEY))) {
- // 濡傛灉鏄┖鐨勶紝浣跨敤formId鍘绘煡
- if (StringUtils.isNotBlank(formKey)) {
- SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(formKey));
- if (Objects.isNull(sysForm)) {
- throw new RuntimeException("璇ユ祦绋嬬粦瀹氱殑琛ㄥ崟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
- }
- FormDetailVO formDetailVO = new FormDetailVO();
- Map<String, Object> data = new HashMap<>(1);
- data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
- formDetailVO.setFormJsonObj(data);
- formDetailVO.setBeforeNodeName(taskName);
- formDetailVO.setCurrent(Boolean.TRUE);
- return Arrays.asList(formDetailVO);
- } else {
- return new ArrayList<>(1);
- }
- }
+
// 杩欓噷鍙渶瑕佹煡鑷韩浠ュ強涓婁竴涓妭鐐�(濡傛灉骞惰鐨勬湁澶氫釜)鐨勮〃鍗曟暟鎹�
List<FormDetailVO> beforeNodes = taskCommonService.getBeforeNodeDefInfo(processDefId, processDefKey, sysFormService, Boolean.TRUE);
List<String> beforeNodeDefIds = beforeNodes.stream().filter(item -> !item.getCurrent() || currentNeedData).map(FormDetailVO::getBeforeNodeDefId).collect(Collectors.toList());
@@ -1285,10 +1280,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())) {
@@ -1308,10 +1309,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