diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java index 0e381a6..72f92b3 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java +++ b/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 deadline; /** 流程状态 未发起、处理中、处理完成*/ private String bpmStatus; /** 超时提醒*/ @@ -88,4 +90,4 @@ public class TaskDTO implements java.io.Serializable { } - \ No newline at end of file + diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java index c100c40..9b5111d 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java @@ -296,6 +296,7 @@ public class ActivitiServiceImpl implements ActivitiService { Set needSet = new HashSet(); needSet.add(WorkFlowGlobals.BPM_BIZ_TITLE); needSet.add(WorkFlowGlobals.BPM_DES_FORM_CODE); + needSet.add("deadline"); Map processVariables = runtimeService.getVariables(processInstanceId,needSet); //流程定义 @@ -309,6 +310,7 @@ public class ActivitiServiceImpl implements ActivitiService { dto.setTaskId(t.getTaskDefinitionKey()); dto.setTaskEndTime(t.getDueDate()); dto.setProcessInstanceId(t.getProcessInstanceId()); + dto.setDeadline(oConvertUtils.getString(processVariables.get("deadline"))); dto.setProcessApplyUserId(applyUserId); // dto.setProcessApplyUserName(ownerSysUser!=null?ownerSysUser.getRealname():""); dto.setProcessDefinitionId(processInstance != null ? processInstance.getProcessDefinitionId() : null); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java index cb1fcd1..1a6f992 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java @@ -80,6 +80,7 @@ public class TaskTask implements Serializable { private java.lang.String processType; /**流程状态*/ @Excel(name = "流程状态", width = 15) + @Dict(dicCode = "super_status") @Schema(description = "流程状态") private java.lang.String bpmStatus; /**关联台账事项ID*/