From 863df4321f1fa0e8790150479b796749d981a21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Wed, 31 Jan 2024 22:42:45 +0800 Subject: [PATCH] 123 --- .../java/com/ruoyi/cai/util/CaiDateUtil.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java index 647843c2..3fed3129 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java @@ -26,21 +26,32 @@ public class CaiDateUtil { long days = absSeconds / (60 * 60 * 24); long hours = (absSeconds % (60 * 60 * 24)) / (60 * 60); long minutes = (absSeconds % (60 * 60)) / 60; + long secs = absSeconds % 60; if(days < 30){ - return days+"天"+hours+"小时"+minutes+"分钟"; + StringBuilder sb = new StringBuilder(); + if(days != 0){ + sb.append(days).append("天").append(hours).append("小时").append(minutes).append("分钟"); + }else if(hours != 0){ + sb.append(hours).append("小时").append(minutes).append("分钟"); + }else if(minutes != 0){ + sb.append(minutes).append("分钟"); + }else { + sb.append(secs).append("秒"); + } + return sb.toString(); } Period period = Period.between(minTime.toLocalDate(), maxTime.toLocalDate()); - StringBuilder stringBuilder = new StringBuilder(); + StringBuilder sb = new StringBuilder(); if(period.getYears() != 0){ - stringBuilder.append(period.getYears()).append("天"); + sb.append(period.getYears()).append("天"); } if(period.getMonths() != 0){ - stringBuilder.append(period.getMonths()).append("天"); + sb.append(period.getMonths()).append("天"); } if(period.getDays() != 0){ - stringBuilder.append(period.getDays()).append("天"); + sb.append(period.getDays()).append("天"); } - return stringBuilder.toString(); + return sb.toString(); }