sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/20260525

Browse Source
This commit is contained in:
wsm
2026-05-26 09:53:41 +08:00
parent a9f99b7fd2 54ad9560f4
commit 4ac462425c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java
+2
View File
@@ -55,6 +55,8 @@ public class TaskDTO implements java.io.Serializable {
/** 业务标题*/ /** 业务标题*/
private String bpmBizTitle; private String bpmBizTitle;
/** 流程名称（业务自定义） */
private String flowName;
/** 截止时间 */ /** 截止时间 */
private String deadline; private String deadline;
/** 截止时间是否逾期 */ /** 截止时间是否逾期 */
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java
+3
View File
@@ -297,6 +297,7 @@ public class ActivitiServiceImpl implements ActivitiService {
needSet.add(WorkFlowGlobals.BPM_BIZ_TITLE); needSet.add(WorkFlowGlobals.BPM_BIZ_TITLE);
needSet.add(WorkFlowGlobals.BPM_DES_FORM_CODE); needSet.add(WorkFlowGlobals.BPM_DES_FORM_CODE);
needSet.add("deadline"); needSet.add("deadline");
needSet.add("flow_name");
Map<String, Object> processVariables = runtimeService.getVariables(processInstanceId,needSet); Map<String, Object> processVariables = runtimeService.getVariables(processInstanceId,needSet);
//流程定义 //流程定义
@@ -312,6 +313,8 @@ public class ActivitiServiceImpl implements ActivitiService {
dto.setProcessInstanceId(t.getProcessInstanceId()); dto.setProcessInstanceId(t.getProcessInstanceId());
String deadline = oConvertUtils.getString(processVariables.get("deadline")); String deadline = oConvertUtils.getString(processVariables.get("deadline"));
dto.setDeadline(deadline); dto.setDeadline(deadline);
String flowName = oConvertUtils.getString(processVariables.get("flow_name"));
dto.setFlowName(flowName);
Long deadlineGapDays = calcDeadlineGapDays(deadline); Long deadlineGapDays = calcDeadlineGapDays(deadline);
dto.setDeadlineOverdue(false); dto.setDeadlineOverdue(false);
dto.setDeadlineSoon(false); dto.setDeadlineSoon(false);