diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumContractReceivePeriodUnit.java b/mallinkService/src/main/java/com/iformall/enums/EnumContractReceivePeriodUnit.java index 03535ebb2..a47cc578e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumContractReceivePeriodUnit.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumContractReceivePeriodUnit.java @@ -43,10 +43,12 @@ public enum EnumContractReceivePeriodUnit { instance.add(Calendar.MONTH, period); //instance.add(Calendar.DATE, -1); instance.add(Calendar.SECOND, -1); + instance.set(Calendar.MILLISECOND, 0); //几个季度之后 }else if (unit == QUARTER.getCode().intValue()) { instance = DateUtils.getAfterQuaterStartDay(instance.getTime(), period); instance.add(Calendar.SECOND, -1); + instance.set(Calendar.MILLISECOND, 0); } return instance; } @@ -63,12 +65,14 @@ public enum EnumContractReceivePeriodUnit { instance.add(Calendar.MONTH, period); //instance.add(Calendar.DAY_OF_MONTH, -1); instance.add(Calendar.SECOND, -1); + instance.set(Calendar.MILLISECOND, 0); return instance.getTime(); } //几个季度之后 }else if (unit == QUARTER.getCode().intValue()) { Calendar instance = DateUtils.getAfterQuaterStartDay(date, period); instance.add(Calendar.SECOND, -1); + instance.set(Calendar.MILLISECOND, 0); return instance.getTime(); } return date; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index c3a1e345b..f4d1368f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1917,6 +1917,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //结束时间 instance.clear(); instance.setTime(start); + instance.set(Calendar.MILLISECOND, 0); instance = EnumContractReceivePeriodUnit.getAfterCalendarDay(instance, receivePeriod, dayType); //instance.add(dayType, receivePeriod); //instance.add(Calendar.DATE, -1); @@ -1949,7 +1950,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { } if(timeVo.getEndDate().after(end)){ - timeVo.setEndDate(end); + Calendar endinstance = Calendar.getInstance(); + endinstance.setTime(end); + endinstance.set(Calendar.MILLISECOND, 0); + timeVo.setEndDate(endinstance.getTime()); } list.add(timeVo); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 93c4002e1..df4a1025d 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -87,6 +87,7 @@ public class DateUtils { try { Date date = formatter.parse(timeStr); calendar.setTime(date); + calendar.set(Calendar.MILLISECOND, 0); } catch (ParseException e) { e.printStackTrace(); } @@ -1295,6 +1296,7 @@ public class DateUtils { Calendar cale = Calendar.getInstance(); cale.setTime(date); cale.add(type,set); + cale.set(Calendar.MILLISECOND, 0); return cale.getTime(); }