From 80111aa449383c0c0d1736d931fbda992abc87a3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 6 Aug 2024 14:15:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=AD=E5=BF=83=E5=89=A9=E4=BD=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8C=89=E8=87=AA=E7=84=B6=E6=97=A5=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1217326366556160]后端-工单中心剩余时间按自然日和工作日显示 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1217326366556160 --- .../column/handler/ProcessTaskExpiredTimeColumn.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java index d3d23309c..1b8be0485 100644 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java @@ -12,10 +12,7 @@ import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.workcenter.dto.JoinTableColumnVo; import neatlogic.framework.process.workcenter.dto.SelectColumnVo; import neatlogic.framework.process.workcenter.dto.TableSelectColumnVo; -import neatlogic.framework.process.workcenter.table.ISqlTable; -import neatlogic.framework.process.workcenter.table.ProcessTaskSlaSqlTable; -import neatlogic.framework.process.workcenter.table.ProcessTaskSlaTimeSqlTable; -import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable; +import neatlogic.framework.process.workcenter.table.*; import neatlogic.framework.process.workcenter.table.util.SqlTableUtil; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; import org.apache.commons.collections4.CollectionUtils; @@ -186,6 +183,10 @@ public class ProcessTaskExpiredTimeColumn extends ProcessTaskColumnBase implemen new SelectColumnVo(ProcessTaskSqlTable.FieldEnum.STATUS.getValue()) ) )); + add(new TableSelectColumnVo(new WorkTimeSqlTable(), Arrays.asList( + new SelectColumnVo(WorkTimeSqlTable.FieldEnum.UUID.getValue(),"worktimeUuid"), + new SelectColumnVo(WorkTimeSqlTable.FieldEnum.NAME.getValue(),"worktimeName") + ))); /*add(new TableSelectColumnVo(new ProcessTaskStepSlaSqlTable(), Arrays.asList( new SelectColumnVo(ProcessTaskStepSlaSqlTable.FieldEnum.PROCESSTASK_STEP_ID.getValue(), "slaStepId"), -- Gitee