From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java | 38 ++++++++++----------------------------
1 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
index d1cb144..69993f7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProgramFlowStatusQueryService.java
@@ -4,22 +4,10 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
-import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
-import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.mapper.NcNodeMapper;
-import org.springblade.mdm.program.vo.NcNodeVO;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-
-import java.util.List;
-
/**
- * 绋嬪簭鑺傜偣
+ * 绋嬪簭娴佺▼瑁呭～鏌ヨ
*
* @author yangys
*/
@@ -27,31 +15,25 @@
@Service
@AllArgsConstructor
public class ProgramFlowStatusQueryService {
- private final RuntimeService runtimeService;
-
- private final ApproveRecordService approveRecordService;
private final HistoryService historyService;
- public int queryFlowStatus(Long ncPogramId) {
-
- List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getNcProgramId, ncPogramId).orderByDesc(ApproveRecord::getCreateTime).last("limit 1").list();
-
- if(records.isEmpty()){
- return 0;
+ public static final int STATUS_NONE = 0;
+ public static final int STATUS_PROCESSING = 1;
+ public static final int STATUS_FINISHED = 2;
+ public int queryFlowStatus(String processInstanceId) {
+ if(processInstanceId == null){
+ return STATUS_NONE;
}
- String processInstanceId = records.get(0).getProcessInstanceId();
-
- int status = 0;
+ int status;
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
if (historicProcessInstance != null && historicProcessInstance.getEndTime() != null) {
// 娴佺▼宸插畬鎴�
- status = 2; //宸查�氳繃锛屾湁鏃犻┏鍥炲憿锛�
- //妫�鏌ユ渶鍚庝竴涓鎵圭粨鏋滐紝濡傛灉鏃禢锛岄偅灏辨椂椹冲洖浜唖tatus = =3;
+ status = STATUS_FINISHED; //瀹屾垚
} else {
// 娴佺▼鏈畬鎴�
- status = 1;
+ status = STATUS_PROCESSING;
}
return status;
}
--
Gitblit v1.9.3