From 0d61b9bfca526e9c3da2209de8f9f367e76fd013 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 18:09:35 +0800
Subject: [PATCH] 修改constant类名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
index 2c23788..aed132f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -10,26 +9,21 @@
import org.apache.poi.ss.usermodel.DateUtil;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
-import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
-import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.*;
-import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Map;
@Slf4j
@RestController
@@ -60,7 +54,7 @@
.like(StringUtils.isNotBlank(queryVO.getDrawingNo()), TaskDispatch::getDrawingNo,queryVO.getDrawingNo())
.ne(TaskDispatch::getStatus,TaskDispatch.STATUS_INIT).ne(TaskDispatch::getStatus,TaskDispatch.STATUS_STARTED)
.ge(queryVO.getCreateTimeBegin()!=null, TaskDispatch::getCreateTime,queryVO.getCreateTimeBegin())
- .le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end)
+ .le(queryVO.getCreateTimeEnd()!=null, TaskDispatch::getCreateTime,end).orderByDesc(TaskDispatch::getCreateTime)
.page(Condition.getPage(queryVO)));
}
/**
@@ -89,13 +83,15 @@
BeanUtils.copyProperties(dispatch, startVO);
startVO.setTitle(startVO.getDrawingNo()+"-"+startVO.getProcessNo()+"-"+startVO.getProcessEdition()+"鏁版帶绋嬪簭缂栧埗");
try {
- String instId = dispatcher.start(startVO);
+ FlowStartResult result = dispatcher.start(startVO);
dispatch.setStatus(TaskDispatch.STATUS_STARTED);
- dispatch.setProcessInstanceId(instId);
+ dispatch.setProcessInstanceId(result.getProcessInstanceId());
+ dispatch.setProgramNo(result.getProgramNo());
taskDispatchService.updateById(dispatch);
} catch (Exception e) {
log.error("娴佺▼鍚姩寮傚父",e);
dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
+ dispatch.setErrMsg(e.getMessage());
taskDispatchService.updateById(dispatch);
return R.fail("浠诲姟鍚姩寮傚父");
}
--
Gitblit v1.9.3