From f681b7e5c33cf64fb37ce11a6a165bd6151af9b1 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Mon, 18 May 2026 09:47:42 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260518-=E5=BE=85=E5=8A=9E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?deadline=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BB=8E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/modules/bpm/dto/TaskDTO.java | 4 +++- .../jeecg/modules/bpm/service/impl/ActivitiServiceImpl.java | 2 ++ .../main/java/org/jeecg/modules/tasktask/entity/TaskTask.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) 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*/