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; }