From e9895d000bf722b708af01b5d89af7c0f147d31d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 23 十二月 2024 09:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 115 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 34 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 a7af1d7..aff08d2 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.FlowComment;
@@ -28,6 +29,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 lombok.RequiredArgsConstructor;
@@ -80,6 +82,7 @@
private final ISysUserService sysUserService;
private final ISysRoleService sysRoleService;
+ private final ISysDeptService sysDeptService;
private final ISysDeployFormService sysInstanceFormService;
private final ISysFormService sysFormService;
private final TaskCommonService taskCommonService;
@@ -831,8 +834,14 @@
stringBuilder.append(sysUser.getNickName()).append(",");
}
if (StringUtils.isNotBlank(identityLink.getGroupId())) {
- SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
- stringBuilder.append(sysRole.getRoleName()).append(",");
+ if (identityLink.getGroupId().contains("dept")) {
+ SysDept sysDept = sysDeptService.selectDeptById(Long.parseLong(identityLink.getGroupId().split(":")[1]));
+ stringBuilder.append(sysDept.getDeptName()).append(",");
+ } else {
+ SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ stringBuilder.append(sysRole.getRoleName()).append(",");
+ }
+
}
}
}
@@ -853,14 +862,14 @@
}
map.put("flowList", hisFlowList);
}
- // 绗竴娆＄敵璇疯幏鍙栧垵濮嬪寲琛ㄥ崟
- if (StringUtils.isNotBlank(deployId)) {
- SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId);
- if (Objects.isNull(sysForm)) {
- return AjaxResult.error("璇峰厛閰嶇疆娴佺▼琛ㄥ崟");
- }
- map.put("formData", JSONObject.parseObject(sysForm.getFormContent()));
- }
+// // 绗竴娆＄敵璇疯幏鍙栧垵濮嬪寲琛ㄥ崟
+// if (StringUtils.isNotBlank(deployId)) {
+// SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId);
+// if (Objects.isNull(sysForm)) {
+// return AjaxResult.error("璇峰厛閰嶇疆娴佺▼琛ㄥ崟");
+// }
+// map.put("formData", JSONObject.parseObject(sysForm.getFormContent()));
+// }
return AjaxResult.success(map);
}
@@ -1149,10 +1158,46 @@
} else {
parameters = taskService.getVariables(taskId);
}
+ List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.FALSE);
+ return AjaxResult.success(beforeNodes);
+ }
+
+ @Override
+ public AjaxResult detail(String taskId) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ // 娴佺▼鍙橀噺
+ Map<String, Object> parameters = new HashMap<>();
+ if (Objects.isNull(task)) {
+ // 濡傛灉涓虹┖锛屽彲鑳芥槸浠诲姟宸茬粡缁撴潫
+ HistoricTaskInstance hisTask = historyService.createHistoricTaskInstanceQuery().taskId(taskId).includeProcessVariables().singleResult();
+ if (Objects.isNull(hisTask)) {
+ throw new RuntimeException("璇ヤ换鍔′笉瀛樺湪");
+ }
+ parameters = hisTask.getProcessVariables();
+ List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);
+ return AjaxResult.success(beforeNodes);
+ } else {
+ parameters = taskService.getVariables(taskId);
+ List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);
+ return AjaxResult.success(beforeNodes);
+ }
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鑺傜偣鍜屼笂涓�鑺傜偣鐨勮〃鍗曞唴瀹�
+ *
+ * @param parameters 鏍规嵁浠诲姟鏌ユ壘鍑烘潵鐨勫弬鏁�
+ * @param formKey task鑷韩鍏宠仈鐨勮〃鍗昳d
+ * @param taskName task鑷韩鐨勪换鍔″悕
+ * @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(task.getFormKey())) {
- SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(task.getFormKey()));
+ if (StringUtils.isNotBlank(formKey)) {
+ SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(formKey));
if (Objects.isNull(sysForm)) {
throw new RuntimeException("璇ユ祦绋嬬粦瀹氱殑琛ㄥ崟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
}
@@ -1160,35 +1205,38 @@
Map<String, Object> data = new HashMap<>(1);
data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
formDetailVO.setFormJsonObj(data);
- formDetailVO.setBeforeNodeName(task.getName());
+ formDetailVO.setBeforeNodeName(taskName);
formDetailVO.setCurrent(Boolean.TRUE);
- return AjaxResult.success(Arrays.asList(formDetailVO));
+ return Arrays.asList(formDetailVO);
} else {
- return AjaxResult.success(new ArrayList<>(1));
+ return new ArrayList<>(1);
}
}
// 杩欓噷鍙渶瑕佹煡鑷韩浠ュ強涓婁竴涓妭鐐�(濡傛灉骞惰鐨勬湁澶氫釜)鐨勮〃鍗曟暟鎹�
- List<FormDetailVO> beforeNodes = taskCommonService.getBeforeNodeDefId(task.getProcessDefinitionId(), task.getTaskDefinitionKey(), sysFormService);
- List<String> beforeNodeDefIds = beforeNodes.stream().filter(item -> !item.getCurrent()).map(FormDetailVO::getBeforeNodeDefId).collect(Collectors.toList());
- Map<String, Object> newP = new HashMap<>();
- if (CollectionUtils.isNotEmpty(beforeNodeDefIds)) {
- for (String key : parameters.keySet()) {
- // 杩囨护鐩爣鏁版嵁锛屽皢鐩爣琛ㄥ崟鏁版嵁鏀惧埌鏂癿ap涓�
- if (beforeNodeDefIds.stream().anyMatch(defId -> key.startsWith(defId))) {
- if (key.contains(ProcessConstants.TASK_FORM_KEY)) {
- newP.put(key, parameters.get(key));
- } else {
- newP.put(key.split("&")[1], parameters.get(key));
+ 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());
+
+ // 澶勭悊姣忎釜琛ㄥ崟鐨勬暟鎹�
+ for (FormDetailVO formDetailVO : beforeNodes) {
+ if (formDetailVO.getCurrent() && !currentNeedData) {
+ continue; // 璺宠繃褰撳墠鑺傜偣锛屽洜涓哄綋鍓嶈妭鐐瑰湪鑾峰彇鍓嶇疆鑺傜偣鏃跺凡缁忚缃繃浜�(浣嗚〃鍗曟暟鎹病鏈夌粰)
+ }
+
+ Map<String, Object> newP = new HashMap<>();
+ if (CollectionUtils.isNotEmpty(beforeNodeDefIds)) {
+ for (String key : parameters.keySet()) {
+ // 杩囨护鎷垮埌鐩爣琛ㄥ崟鏁版嵁锛屽皢鐩爣琛ㄥ崟鏁版嵁鏀惧埌鏂癿ap涓�
+ if (key.startsWith(formDetailVO.getBeforeNodeDefId())) {
+ if (key.contains(ProcessConstants.TASK_FORM_KEY)) {
+ newP.put(key, parameters.get(key));
+ }
+ else {
+ newP.put(key.split("&")[1], parameters.get(key));
+ }
}
}
}
- }
- // 鎷垮埌鐩爣琛ㄥ崟鍚庯紝鍐嶅鐞嗘瘡涓〃鍗曠殑鏁版嵁
- for (FormDetailVO formDetailVO : beforeNodes) {
- if (formDetailVO.getCurrent()) {
- continue; // 璺宠繃褰撳墠鑺傜偣锛屽洜涓哄綋鍓嶈妭鐐瑰湪鑾峰彇鍓嶇疆鑺傜偣鏃跺凡缁忚缃繃浜�
- }
Object form = newP.get(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
if (Objects.nonNull(form)) {
JSONObject formJson = JSONObject.parseObject(JSON.toJSONString(form));
@@ -1224,8 +1272,7 @@
formDetailVO.setFormJsonObj(newP);
}
}
-
- return AjaxResult.success(beforeNodes);
+ return beforeNodes;
}
/**
--
Gitblit v1.8.0