From d34d3c83500d5a68715a280eee3d930c88291d71 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 19:10:05 +0800
Subject: [PATCH] 增加新编程序统计；固化程序统计
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 010b1a8..f868532 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
@@ -24,6 +24,7 @@
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.*;
@@ -60,7 +61,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)));
}
/**
@@ -87,15 +88,17 @@
TaskAssignVO startVO = new TaskAssignVO();
BeanUtils.copyProperties(dispatch, startVO);
- startVO.setTitle(startVO.getTitle()+"-"+startVO.getProcessNo()+"-"+startVO.getProcessEdition()+"鏁版帶绋嬪簭缂栧埗");
+ 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