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 39793c113d3d13d2a7117ada2072cbea96928620..6b6940d4770f1176fedc491247f763645e977193 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 processTaskStepInOperationList = processTaskMapper.getProcessTaskStepInOperationListByProcessTaskId(processTaskId); if (CollectionUtils.isNotEmpty(processTaskStepInOperationList)) { // 如果后台有正在异步处理中的步骤,则返回status=running,前端等待一定时间后再次请求 @@ -94,8 +91,6 @@ 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 a0d1c29395188a756cbef913daa62a2d09a2928a..de776a09e76ee02c5433e05a924615d3d44e00fe 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 processTaskList = processTaskMapper.getProcessTaskListByIdList(Collections.singletonList(processTaskId)); - return processTaskList.get(0); + return null; } }