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 3671c78bef22c609dfa2003fa0c0e435a39b0007..39793c113d3d13d2a7117ada2072cbea96928620 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,27 @@ 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.constvalue.ProcessTaskStatus; 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; +import java.util.Objects; @Service @AuthAction(action = PROCESS_BASE.class) @@ -65,7 +66,12 @@ 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"); + return resultObj; + } List processTaskStepInOperationList = processTaskMapper.getProcessTaskStepInOperationListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskStepInOperationList)) { // 如果后台有正在异步处理中的步骤,则返回status=running,前端等待一定时间后再次请求 @@ -88,6 +94,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; } 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 77bdafddd77bf2afa60b6d2774c5c7ac8fcc7c8a..a0d1c29395188a756cbef913daa62a2d09a2928a 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); } }