Merge branch 'master' into feature/20260525

jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java

@@ -55,6 +55,8 @@ public class TaskDTO implements java.io.Serializable {
 	
 	/** 业务标题*/
 	private String bpmBizTitle;
+	/** 流程名称（业务自定义） */
+	private String flowName;
 	/** 截止时间 */
 	private String deadline;
 	/** 截止时间是否逾期 */

jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java

@@ -297,6 +297,7 @@ public class ActivitiServiceImpl implements ActivitiService {
 			needSet.add(WorkFlowGlobals.BPM_BIZ_TITLE);
 			needSet.add(WorkFlowGlobals.BPM_DES_FORM_CODE);
 			needSet.add("deadline");
+			needSet.add("flow_name");
 			Map<String, Object> processVariables = runtimeService.getVariables(processInstanceId,needSet);
 			
 			//流程定义
@@ -312,6 +313,8 @@ public class ActivitiServiceImpl implements ActivitiService {
 			dto.setProcessInstanceId(t.getProcessInstanceId());
 			String deadline = oConvertUtils.getString(processVariables.get("deadline"));
 			dto.setDeadline(deadline);
+			String flowName = oConvertUtils.getString(processVariables.get("flow_name"));
+			dto.setFlowName(flowName);
 			Long deadlineGapDays = calcDeadlineGapDays(deadline);
 			dto.setDeadlineOverdue(false);
 			dto.setDeadlineSoon(false);