| @@ -43,10 +43,12 @@ public enum EnumContractReceivePeriodUnit { | |||||
| instance.add(Calendar.MONTH, period); | instance.add(Calendar.MONTH, period); | ||||
| //instance.add(Calendar.DATE, -1); | //instance.add(Calendar.DATE, -1); | ||||
| instance.add(Calendar.SECOND, -1); | instance.add(Calendar.SECOND, -1); | ||||
| instance.set(Calendar.MILLISECOND, 0); | |||||
| //几个季度之后 | //几个季度之后 | ||||
| }else if (unit == QUARTER.getCode().intValue()) { | }else if (unit == QUARTER.getCode().intValue()) { | ||||
| instance = DateUtils.getAfterQuaterStartDay(instance.getTime(), period); | instance = DateUtils.getAfterQuaterStartDay(instance.getTime(), period); | ||||
| instance.add(Calendar.SECOND, -1); | instance.add(Calendar.SECOND, -1); | ||||
| instance.set(Calendar.MILLISECOND, 0); | |||||
| } | } | ||||
| return instance; | return instance; | ||||
| } | } | ||||
| @@ -63,12 +65,14 @@ public enum EnumContractReceivePeriodUnit { | |||||
| instance.add(Calendar.MONTH, period); | instance.add(Calendar.MONTH, period); | ||||
| //instance.add(Calendar.DAY_OF_MONTH, -1); | //instance.add(Calendar.DAY_OF_MONTH, -1); | ||||
| instance.add(Calendar.SECOND, -1); | instance.add(Calendar.SECOND, -1); | ||||
| instance.set(Calendar.MILLISECOND, 0); | |||||
| return instance.getTime(); | return instance.getTime(); | ||||
| } | } | ||||
| //几个季度之后 | //几个季度之后 | ||||
| }else if (unit == QUARTER.getCode().intValue()) { | }else if (unit == QUARTER.getCode().intValue()) { | ||||
| Calendar instance = DateUtils.getAfterQuaterStartDay(date, period); | Calendar instance = DateUtils.getAfterQuaterStartDay(date, period); | ||||
| instance.add(Calendar.SECOND, -1); | instance.add(Calendar.SECOND, -1); | ||||
| instance.set(Calendar.MILLISECOND, 0); | |||||
| return instance.getTime(); | return instance.getTime(); | ||||
| } | } | ||||
| return date; | return date; | ||||
| @@ -1917,6 +1917,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //结束时间 | //结束时间 | ||||
| instance.clear(); | instance.clear(); | ||||
| instance.setTime(start); | instance.setTime(start); | ||||
| instance.set(Calendar.MILLISECOND, 0); | |||||
| instance = EnumContractReceivePeriodUnit.getAfterCalendarDay(instance, receivePeriod, dayType); | instance = EnumContractReceivePeriodUnit.getAfterCalendarDay(instance, receivePeriod, dayType); | ||||
| //instance.add(dayType, receivePeriod); | //instance.add(dayType, receivePeriod); | ||||
| //instance.add(Calendar.DATE, -1); | //instance.add(Calendar.DATE, -1); | ||||
| @@ -1949,7 +1950,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| } | } | ||||
| if(timeVo.getEndDate().after(end)){ | 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); | list.add(timeVo); | ||||
| @@ -87,6 +87,7 @@ public class DateUtils { | |||||
| try { | try { | ||||
| Date date = formatter.parse(timeStr); | Date date = formatter.parse(timeStr); | ||||
| calendar.setTime(date); | calendar.setTime(date); | ||||
| calendar.set(Calendar.MILLISECOND, 0); | |||||
| } catch (ParseException e) { | } catch (ParseException e) { | ||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| } | } | ||||
| @@ -1295,6 +1296,7 @@ public class DateUtils { | |||||
| Calendar cale = Calendar.getInstance(); | Calendar cale = Calendar.getInstance(); | ||||
| cale.setTime(date); | cale.setTime(date); | ||||
| cale.add(type,set); | cale.add(type,set); | ||||
| cale.set(Calendar.MILLISECOND, 0); | |||||
| return cale.getTime(); | return cale.getTime(); | ||||
| } | } | ||||