From 26ef4d9eaee8f88a621587a71cdc066ed578176c Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 29 May 2024 12:23:25 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20IT=E6=9C=8D=E5=8A=A1-?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8F=90=E4=BA=A4=E5=90=8E=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E2=80=9C=E5=B7=A5=E5=8D=95=E6=9C=AA=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1166734671708160]IT服务-工单提交后进入工单详情页时提示“工单未提交” http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1166734671708160
---
 .../processtask/ProcessTaskProcessableStepList.java | 13 ++++---------
 .../api/processtask/ProcessTaskStartProcessApi.java |  7 +------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java
index 39793c113..6b6940d47 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.process.auth.PROCESS_BASE;
-import neatlogic.framework.process.constvalue.ProcessTaskStatus;
 import neatlogic.framework.process.dto.ProcessTaskStepInOperationVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.dto.ProcessTaskVo;
@@ -18,10 +17,8 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 @Service
 @AuthAction(action = PROCESS_BASE.class)
@@ -68,10 +65,10 @@ public class ProcessTaskProcessableStepList extends PrivateApiComponentBase {
 		JSONObject resultObj = new JSONObject();
 		resultObj.put("processTaskStatus", processTaskVo.getStatus());
 		resultObj.put("status", "ok");
-		if (Objects.equals(processTaskVo.getStatus(), ProcessTaskStatus.DRAFT.getValue())) {
-			resultObj.put("status", "running");
-			return resultObj;
-		}
+//		if (Objects.equals(processTaskVo.getStatus(), ProcessTaskStatus.DRAFT.getValue())) {
+//			resultObj.put("status", "running");
+//			return resultObj;
+//		}
 		List<ProcessTaskStepInOperationVo> processTaskStepInOperationList = processTaskMapper.getProcessTaskStepInOperationListByProcessTaskId(processTaskId);
 		if (CollectionUtils.isNotEmpty(processTaskStepInOperationList)) {
 			// 如果后台有正在异步处理中的步骤，则返回status=running，前端等待一定时间后再次请求
@@ -94,8 +91,6 @@ public class ProcessTaskProcessableStepList extends PrivateApiComponentBase {
 
 		List<ProcessTaskStepVo> processableStepList = processTaskService.getProcessableStepList(processTaskVo, jsonObj.getString("action"));
 		resultObj.put("tbodyList", processableStepList);
-		List<ProcessTaskVo> processTaskList = processTaskMapper.getProcessTaskListByIdList(Collections.singletonList(processTaskId));
-		resultObj.put("processTask", processTaskList.get(0));
 		return resultObj;
 	}
 
diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java
index a0d1c2939..de776a09e 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.process.auth.PROCESS_BASE;
-import neatlogic.framework.process.dto.ProcessTaskVo;
 import neatlogic.framework.restful.annotation.Description;
 import neatlogic.framework.restful.annotation.Input;
 import neatlogic.framework.restful.annotation.OperationType;
@@ -17,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
 
 @Service
 @OperationType(type = OperationTypeEnum.UPDATE)
@@ -85,9 +82,7 @@ public class ProcessTaskStartProcessApi extends PrivateApiComponentBase {
 //            throw new PermissionDeniedException();
 //        }
 		processTaskService.startProcessProcessTask(jsonObj);
-		Long processTaskId = jsonObj.getLong("processTaskId");
-		List<ProcessTaskVo> processTaskList = processTaskMapper.getProcessTaskListByIdList(Collections.singletonList(processTaskId));
-		return processTaskList.get(0);
+		return null;
 	}
 
 }
-- 
Gitee