From 4f1bce66c2e37fb4fb003be24fe628ed413bc5b2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 28 May 2024 18:59:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=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?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E5=B7=A5=E5=8D=95=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=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/ProcessTaskStartProcessApi.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 77bdafddd..a0d1c2939 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java @@ -1,19 +1,25 @@ package neatlogic.module.process.api.processtask; +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.module.process.service.ProcessTaskService; +import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.service.ProcessTaskService; 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) @AuthAction(action = PROCESS_BASE.class) @@ -22,6 +28,9 @@ public class ProcessTaskStartProcessApi extends PrivateApiComponentBase { @Autowired private ProcessTaskService processTaskService; + @Resource + private ProcessTaskMapper processTaskMapper; + @Override public String getToken() { return "processtask/startprocess"; @@ -76,7 +85,9 @@ public class ProcessTaskStartProcessApi extends PrivateApiComponentBase { // throw new PermissionDeniedException(); // } processTaskService.startProcessProcessTask(jsonObj); - return null; + Long processTaskId = jsonObj.getLong("processTaskId"); + List processTaskList = processTaskMapper.getProcessTaskListByIdList(Collections.singletonList(processTaskId)); + return processTaskList.get(0); } } -- Gitee From a0361bf0cbff9de3f3611f5f0374c1f69bb795f2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 28 May 2024 19:08:30 +0800 Subject: [PATCH 2/4] =?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?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E5=B7=A5=E5=8D=95=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=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 --- .../ProcessTaskProcessableStepList.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 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 3671c78be..db9e7227c 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java @@ -1,26 +1,25 @@ package neatlogic.module.process.api.processtask; -import java.util.*; - +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.ProcessTaskStepInOperationVo; +import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundEditTargetException; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.service.ProcessTaskService; +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; @Service @AuthAction(action = PROCESS_BASE.class) @@ -88,6 +87,8 @@ public class ProcessTaskProcessableStepList extends PrivateApiComponentBase { List processableStepList = processTaskService.getProcessableStepList(processTaskVo, jsonObj.getString("action")); resultObj.put("tbodyList", processableStepList); + List processTaskList = processTaskMapper.getProcessTaskListByIdList(Collections.singletonList(processTaskId)); + resultObj.put("processTask", processTaskList.get(0)); return resultObj; } -- Gitee From bef57dc4a607fa984969c10e81c4dbfe1a7fa27e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 29 May 2024 00:24:06 +0800 Subject: [PATCH 3/4] =?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?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E5=B7=A5=E5=8D=95=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=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 --- .../api/processtask/ProcessTaskProcessableStepList.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 db9e7227c..9646f334f 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java @@ -4,6 +4,7 @@ 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; @@ -20,6 +21,7 @@ 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) @@ -65,6 +67,10 @@ public class ProcessTaskProcessableStepList extends PrivateApiComponentBase { } JSONObject resultObj = new JSONObject(); resultObj.put("status", "ok"); + if (Objects.equals(processTaskVo.getStatus(), ProcessTaskStatus.DRAFT.getValue())) { + resultObj.put("status", "running"); + return resultObj; + } List processTaskStepInOperationList = processTaskMapper.getProcessTaskStepInOperationListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskStepInOperationList)) { // 如果后台有正在异步处理中的步骤，则返回status=running，前端等待一定时间后再次请求 -- Gitee From eafba0cf1e6320f1e86572d6d2af1f663a78f6d3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 29 May 2024 09:56:29 +0800 Subject: [PATCH 4/4] =?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?= =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E5=B7=A5=E5=8D=95=E6=9C=AA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=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 --- .../process/api/processtask/ProcessTaskProcessableStepList.java | 1 + 1 file changed, 1 insertion(+) 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 9646f334f..39793c113 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskProcessableStepList.java @@ -66,6 +66,7 @@ public class ProcessTaskProcessableStepList extends PrivateApiComponentBase { throw new ProcessTaskNotFoundEditTargetException(processTaskId); } 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"); -- Gitee