From c96dba00d9a72ef3a3049bd4c69a27e21e6fe03a Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Fri, 13 Oct 2023 14:49:03 +0800 Subject: [PATCH] date --- .../service/impl/TAgentTaskServiceImpl.java | 11 +++++++---- .../main/java/com/ruoyi/common/utils/DateUtils.java | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java index 2bc2b98..1a7d76e 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java @@ -328,6 +328,8 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService town.setVillageList(villageList); villageList.forEach((village) -> { village.setApprovalFinish(village.getNum().equals(village.getNumApprovalFinish())); + village.setDistriDate(DateUtils.stdRemoveTime(village.getDistriDate())); + village.setHandleDate(DateUtils.stdRemoveTime(village.getHandleDate())); village.setTaskList(bookGroup.getOrDefault(village.getOrgCode(), new ArrayList<>())); village.getTaskList().forEach((x) -> { x.setOtherCount(x.getAllCount() - x.getVoucherCount() - x.getContracCount()); @@ -363,6 +365,8 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService }); Map> taskGroup = ContainerUtils.groupingBy(tAgentTasks, TAgentTask::getOrgCode); list.forEach((x) -> { + x.setDistriDate(DateUtils.stdRemoveTime(x.getDistriDate())); + x.setHandleDate(DateUtils.stdRemoveTime(x.getHandleDate())); x.setTaskList(taskGroup.getOrDefault(x.getOrgCode(), new ArrayList<>())); }); } @@ -576,6 +580,7 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService List villageList = villageMap.getOrDefault(town.getTownCode(), new ArrayList<>()); town.setVillageList(villageList); villageList.forEach((village) -> { + village.setDistriDate(DateUtils.stdRemoveTime(village.getDistriDate())); village.setApprovalFinish(village.getNum().equals(village.getNumApprovalFinish())); village.setTaskList(bookGroup.getOrDefault(village.getOrgCode(), new ArrayList<>())); village.getTaskList().forEach((x) -> { @@ -621,10 +626,8 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService Map> bookGroup = ContainerUtils.groupingBy(tAgentTasks, TAgentTask::getOrgCode); villageGroups.forEach((village) -> { - if(StringUtils.isNotEmpty(village.getHandleDate())) - village.setHandleDate(DateUtils.date(village.getHandleDate(), "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd")); - if(StringUtils.isNotEmpty(village.getDistriDate())) - village.setDistriDate(DateUtils.date(village.getDistriDate(), "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd")); + village.setHandleDate(DateUtils.stdRemoveTime(village.getHandleDate())); + village.setDistriDate(DateUtils.stdRemoveTime(village.getDistriDate())); village.setupOverdueFinish(); village.setOtherCount(village.getAllCount() - village.getContracCount() - village.getVoucherCount()); village.setTaskList(bookGroup.getOrDefault(village.getOrgCode(), new ArrayList<>())); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 88aa6f6..2258335 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -237,6 +237,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static String date(String src, String srcFormat, String dstFormat) { + if(StringUtils.isEmpty(src)) + return src; return DateUtil.format(DateUtil.parse(src, srcFormat), dstFormat); } + + public static String stdRemoveTime(String src) + { + if(StringUtils.isEmpty(src)) + return src; + return date(src, "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd"); + } }