Commit 746b2bf5 authored by wujipeng's avatar wujipeng
Browse files

日期计算优化

parent 84dcb2ef
...@@ -32,7 +32,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity ...@@ -32,7 +32,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity
Date beginTime = contractVO.getBeginTime(); Date beginTime = contractVO.getBeginTime();
Date endTime = contractVO.getEndTime(); Date endTime = contractVO.getEndTime();
int differ = (int) DateUtils.daysBetween(beginTime, endTime); int differ = (int) DateUtils.daysBetween(beginTime, endTime);
contractVO.setRemainingDays(differ); if (differ > NumberConstant.ZERO) {
contractVO.setRemainingDays(differ);
} else {
contractVO.setRemainingDays(NumberConstant.ZERO);
}
} }
return contractList; return contractList;
} }
...@@ -42,7 +46,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity ...@@ -42,7 +46,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity
List<ContractVO> list = baseMapper.listSecondLevel(homId); List<ContractVO> list = baseMapper.listSecondLevel(homId);
for (ContractVO contractVO : list) { for (ContractVO contractVO : list) {
int l = (int) DateUtils.daysBetween(new Date(), contractVO.getEndTime()); int l = (int) DateUtils.daysBetween(new Date(), contractVO.getEndTime());
contractVO.setRemainingDays(l); if (l > NumberConstant.ZERO) {
contractVO.setRemainingDays(l);
} else {
contractVO.setRemainingDays(NumberConstant.ZERO);
}
} }
return list; return list;
} }
......
...@@ -65,7 +65,7 @@ public class DateUtils { ...@@ -65,7 +65,7 @@ public class DateUtils {
LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
// 计算两个日期之间的天数差 // 计算两个日期之间的天数差
return Math.abs(ChronoUnit.DAYS.between(localDate1, localDate2)); return ChronoUnit.DAYS.between(localDate1, localDate2);
} }
/** /**
...@@ -83,8 +83,12 @@ public class DateUtils { ...@@ -83,8 +83,12 @@ public class DateUtils {
public static void main(String[] args) { public static void main(String[] args) {
Date[] dates = getStartAndEndDateOfCurrentMonth(); // 获取当前月份的开始和结束日期
System.out.println("Start date of this month: " + dates[0]); Date[] startAndEndDates = getStartAndEndDateOfCurrentMonth();
System.out.println("End date of this month: " + dates[1]); Date startAndEndDate = startAndEndDates[0];
Date endAndEndDate = startAndEndDates[1];
long l = daysBetween(startAndEndDate, endAndEndDate);
System.out.println(l);
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment