From 88748094ae17ca3b6423c54d307f0d5c40c8f420 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 14:44:13 +0800
Subject: [PATCH] 增加文件完整性校验
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index edbf158..dc80708 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -17,10 +17,13 @@
import org.springblade.core.tool.utils.*;
import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
@@ -48,7 +51,7 @@
private final IUserClient userClient;
private final ProcessProgRefService processProgRefService;
private final ApproveRecordService approveRecordService;
-
+ private final NcProgramService ncProgramService;
/**
* 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
* @param page 鍒嗛〉淇℃伅
@@ -274,7 +277,7 @@
//List<Task> tasks = taskQuery.list();
long total = taskQuery.count();
- Long firstResult = (currentPage-1)*pageSize+1;
+ Long firstResult = (currentPage-1)*pageSize;
List<Task> tasks = taskQuery.listPage(Func.toInt(firstResult), Func.toInt(pageSize));
tasks.forEach(task -> {
FlowVO flow = new FlowVO();
@@ -290,6 +293,7 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
+ flow.setFile(getNcFileString(String.valueOf(task.getProcessVariables().get("programIds"))));
//flow.setProcessDefinitionKey(processDefinition.getKey());
//flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -474,10 +478,10 @@
/**
* 宸插畬缁撶殑娴佺▼鍒嗛〉鍒楄〃
- * @param page
+ * @param page 鍒嗛〉淇℃伅
* @param createTimeBegin
* @param createTimeEnd
- * @param keyword
+ * @param keyword 鍏抽敭瀛�
* @return
*/
public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
@@ -495,7 +499,7 @@
query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
page.setTotal(query.count());
- long firstResult = (page.getCurrent()-1) * page.getSize() + 1;
+ long firstResult = (page.getCurrent()-1) * page.getSize();
List<HistoricProcessInstance> processes = query
.listPage((int)firstResult, (int)page.getSize());
@@ -511,6 +515,7 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
+ vo.setFile(getNcFileString(String.valueOf(processInstance.getProcessVariables().get(FlowContants.PROGRAM_IDS_KEY))));
records.add(vo);
}
@@ -518,4 +523,13 @@
return page;
}
+
+ String getNcFileString(String programIds){
+ String result = "";
+ if(Func.isNotEmpty(programIds)) {
+ List<NcProgram> progList= ncProgramService.listByIds(Func.toLongList(programIds));
+ result = String.join(",",progList.stream().map(NcProgram::getName).toList());
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3