From ae2ff6e562b7d660851ea9f1feb523db40462b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=85=B6=E5=85=B5?= Date: Mon, 26 May 2025 11:08:54 +0800 Subject: [PATCH] =?UTF-8?q?task=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java | 6 +++++- src/main/java/com/sa/zentao/utils/SFunctionColums.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java index 17aa703..c0bc3e6 100644 --- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java +++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java @@ -178,7 +178,11 @@ public class ZtTaskServiceImpl extends ServiceImpl impleme if (CollectionUtils.isEmpty(taskList)) { return new ArrayList<>(); } - + taskList=taskList.stream().peek(e->{ + if(e.getDeadline()!=null){ + e.setDeadline(DateUtils.getDayLast(e.getDeadline())); + } + }).collect(Collectors.toList()); return BeanCopyUtil.copyListProperties(taskList, ZtTaskDTO::new); } diff --git a/src/main/java/com/sa/zentao/utils/SFunctionColums.java b/src/main/java/com/sa/zentao/utils/SFunctionColums.java index 74888b0..0669095 100644 --- a/src/main/java/com/sa/zentao/utils/SFunctionColums.java +++ b/src/main/java/com/sa/zentao/utils/SFunctionColums.java @@ -36,7 +36,10 @@ public class SFunctionColums { result.add(ZtTask::getExecution); result.add(ZtTask::getProject); result.add(ZtTask::getCanceledby); + result.add(ZtTask::getEstStarted); + result.add(ZtTask::getRealstarted); result.add(ZtTask::getCanceleddate); + result.add(ZtTask::getPri); return result; }