From 053a438acf9ec33e182b25211ce8108f0367feac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 09:35:58 +0800
Subject: [PATCH] 固化流程，建立node；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 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 dc80708..180c7f8 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
@@ -12,17 +12,16 @@
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
+import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
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.FlowProgramFile;
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;
@@ -35,7 +34,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -52,6 +50,7 @@
private final ProcessProgRefService processProgRefService;
private final ApproveRecordService approveRecordService;
private final NcProgramService ncProgramService;
+ private final FlowProgramFileService flowProgramFileService;
/**
* 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
* @param page 鍒嗛〉淇℃伅
@@ -68,9 +67,6 @@
TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
if (Func.isNotEmpty(createTimeBegin)) {
todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
-
- ////濡傛灉鏌ヨ瀹炰緥鐨勫紑濮嬫椂闂达細鍙兘鐢ㄤ互涓嬭繖涓紝鍏堟煡鍑哄疄渚媔d鏉�
- //todoQuery.processInstanceIdIn()
}
if (Func.isNotEmpty(createTimeEnd)) {
todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
@@ -85,11 +81,7 @@
// 鏋勫缓鍒楄〃鏁版嵁
FlowVO bladeFlow = new FlowVO();
buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
- flowList.forEach(flowVO -> {
- if(flowVO.getVariables().containsKey("machineCode")){
- //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
- }
- });
+
// 璁＄畻鎬绘暟
long count = todoQuery.count();
@@ -102,15 +94,17 @@
void addKeywordCondition(TaskQuery todoQuery,String keyword) {
if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
todoQuery.or();
+ todoQuery.processVariableValueLike(FlowContants.TITLE,likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_NO, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ todoQuery.processVariableValueLike(FlowContants.CRAFT_EDITION, likeVal);
- todoQuery.processVariableValueLike("processNo", "%" + keyword + "%");
- todoQuery.processVariableValueLike("machineCode", "%" + keyword + "%");
- todoQuery.processVariableValueLike("machineMode", "%" + keyword + "%");
- todoQuery.processVariableValueLike("processName", "%" + keyword + "%");
- todoQuery.processVariableValueLike("processEdition", "%" + keyword + "%");
- todoQuery.processVariableValueLike("craftEdition", "%" + keyword + "%");
-
+ todoQuery.processDefinitionNameLike(likeVal);
todoQuery.endOr();
}
}
@@ -293,7 +287,7 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
- flow.setFile(getNcFileString(String.valueOf(task.getProcessVariables().get("programIds"))));
+ flow.setFile(getFileString(task.getProcessInstanceId()));
//flow.setProcessDefinitionKey(processDefinition.getKey());
//flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -515,7 +509,7 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
- vo.setFile(getNcFileString(String.valueOf(processInstance.getProcessVariables().get(FlowContants.PROGRAM_IDS_KEY))));
+ vo.setFile(getFileString(processInstance.getId()));
records.add(vo);
}
@@ -523,13 +517,15 @@
return page;
}
-
- String getNcFileString(String programIds){
+ /*
+ 鑾峰彇鍒楄〃涓殑鏂囦欢鍚�
+ */
+ String getFileString(String processInstanceId){
String result = "";
- if(Func.isNotEmpty(programIds)) {
- List<NcProgram> progList= ncProgramService.listByIds(Func.toLongList(programIds));
- result = String.join(",",progList.stream().map(NcProgram::getName).toList());
- }
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+
+ result = String.join(",",fileList.stream().map(FlowProgramFile::getName).toList());
+
return result;
}
}
--
Gitblit v1.9.3