From e9d3a1a9c1f34263bf2bbe9b319506ba92e66bf3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 07 二月 2025 17:30:46 +0800
Subject: [PATCH] 任务是否能跳过、容缺的回显
---
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 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 ef68382..e0ff79b 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -800,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
@@ -1243,31 +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))) {
- FormDetailVO formDetailVO = new FormDetailVO();
- formDetailVO.setBeforeNodeName(taskName);
- formDetailVO.setCurrent(Boolean.TRUE);
- // 濡傛灉鏄┖鐨勶紝浣跨敤formId鍘绘煡
- if (StringUtils.isNotBlank(formKey)) {
- SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(formKey));
- if (Objects.isNull(sysForm)) {
- throw new RuntimeException("璇ユ祦绋嬬粦瀹氱殑琛ㄥ崟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
- }
- Map<String, Object> data = new HashMap<>(1);
- data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
- formDetailVO.setFormJsonObj(data);
- return Arrays.asList(formDetailVO);
- } else {
- return Arrays.asList(formDetailVO);
- }
- }
// 杩欓噷鍙渶瑕佹煡鑷韩浠ュ強涓婁竴涓妭鐐�(濡傛灉骞惰鐨勬湁澶氫釜)鐨勮〃鍗曟暟鎹�
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());
--
Gitblit v1.8.0