From c9533d1889a36bbd671354fee081c6512c667946 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 05 十二月 2024 05:41:56 +0800
Subject: [PATCH] 流程办理回显逻辑变更：处理当前节点只拉取上一个节点及本节点的表单数据
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 88 insertions(+), 32 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 d2d5a45..a7af1d7 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -19,6 +19,7 @@
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.vo.FlowQueryVo;
import com.ycl.domain.vo.FlowTaskVo;
+import com.ycl.domain.vo.FormDetailVO;
import com.ycl.factory.FlowServiceFactory;
import com.ycl.flow.CustomProcessDiagramGenerator;
import com.ycl.flow.FindNextNodeUtil;
@@ -26,6 +27,7 @@
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.ISysRoleService;
import com.ycl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@@ -80,6 +82,7 @@
private final ISysRoleService sysRoleService;
private final ISysDeployFormService sysInstanceFormService;
private final ISysFormService sysFormService;
+ private final TaskCommonService taskCommonService;
/**
* 瀹屾垚瀹℃牳浠诲姟
@@ -119,10 +122,21 @@
if (Objects.isNull(task)) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
+ 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));
+// }
+ }
+ }
// 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
taskService.claim(taskId, SecurityUtils.getUserId() + "");
taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
- taskService.complete(taskId, variables);
+ taskService.complete(taskId, newV);
return AjaxResult.success("鎻愪氦鎴愬姛");
}
@@ -1135,41 +1149,83 @@
} else {
parameters = taskService.getVariables(taskId);
}
-
- JSONObject oldVariables = JSONObject.parseObject(JSON.toJSONString(parameters.get("formJson")));
- if (Objects.isNull(oldVariables)) {
- // 濡傛灉鏄┖鐨勶紝鐩存帴浣跨敤涓昏〃鍗曪紝鍥犱负杩欎唬琛ㄦ槸娴佺▼涓殑绗竴涓彁浜よ〃鍗曠殑浠诲姟
- String deploymentId = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getDeploymentId();
- return this.flowFormData(deploymentId);
+ 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 (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(task.getName());
+ formDetailVO.setCurrent(Boolean.TRUE);
+ return AjaxResult.success(Arrays.asList(formDetailVO));
+ } else {
+ return AjaxResult.success(new ArrayList<>(1));
+ }
}
- List<JSONObject> oldFields = JSON.parseObject(JSON.toJSONString(oldVariables.get("widgetList")), new TypeReference<List<JSONObject>>() {
- });
- // 璁剧疆宸插～鍐欑殑琛ㄥ崟涓虹鐢ㄧ姸鎬�
- for (JSONObject oldField : oldFields) {
- JSONObject options = oldField.getJSONObject("options");
- options.put("disabled", true);
- }
- // TODO 鏆傛椂鍙鐞嗙敤鎴蜂换鍔′笂鐨勮〃鍗�
- if (StringUtils.isNotBlank(task.getFormKey())) {
- SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(task.getFormKey()));
- JSONObject data = JSONObject.parseObject(sysForm.getFormContent());
- List<JSONObject> newFields = JSON.parseObject(JSON.toJSONString(data.get("widgetList")), new TypeReference<List<JSONObject>>() {
- });
- // 琛ㄥ崟鍥炴樉鏃� 鍔犲叆瀛愯〃鍗曚俊鎭埌娴佺▼鍙橀噺涓�
- for (JSONObject newField : newFields) {
- String key = newField.getString("id");
- // 澶勭悊鍥剧墖涓婁紶缁勪欢鍥炴樉闂
- if ("picture-upload".equals(newField.getString("type"))) {
- parameters.put(key, new ArrayList<>());
- } else {
- parameters.put(key, null);
+ // 杩欓噷鍙渶瑕佹煡鑷韩浠ュ強涓婁竴涓妭鐐�(濡傛灉骞惰鐨勬湁澶氫釜)鐨勮〃鍗曟暟鎹�
+ 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));
+ }
}
}
- oldFields.addAll(newFields);
}
- oldVariables.put("widgetList", oldFields);
- parameters.put("formJson", oldVariables);
- return AjaxResult.success(parameters);
+
+ // 鎷垮埌鐩爣琛ㄥ崟鍚庯紝鍐嶅鐞嗘瘡涓〃鍗曠殑鏁版嵁
+ 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));
+ 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);
+ }
+ // TODO 鏆傛椂鍙鐞嗙敤鎴蜂换鍔′笂鐨勮〃鍗�
+// if (StringUtils.isNotBlank(task.getFormKey())) {
+// SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(task.getFormKey()));
+// JSONObject data = JSONObject.parseObject(sysForm.getFormContent());
+// List<JSONObject> newFields = JSON.parseObject(JSON.toJSONString(data.get(ProcessConstants.WIDGET_LIST)), new TypeReference<List<JSONObject>>() {
+// });
+// // 琛ㄥ崟鍥炴樉鏃� 鍔犲叆瀛愯〃鍗曚俊鎭埌娴佺▼鍙橀噺涓�
+// for (JSONObject newField : newFields) {
+// String key = newField.getString("id");
+// // 澶勭悊鍥剧墖涓婁紶缁勪欢鍥炴樉闂
+// if ("picture-upload".equals(newField.getString("type"))) {
+// parameters.put(key, new ArrayList<>());
+// } else {
+// parameters.put(key, null);
+// }
+// }
+// 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 AjaxResult.success(beforeNodes);
}
/**
--
Gitblit v1.8.0