date

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<String, List<TAgentTask>> 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<AgentTaskVillageGroup> 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<String, List<TAgentTask>> 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<>()));

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");
+    }
 }