|
|
|
@@ -1865,19 +1865,28 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
//结束时间 |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
System.out.println(sd.format(start)); |
|
|
|
// System.out.println(sd.format(start)); |
|
|
|
instance.clear(); |
|
|
|
instance.setTime(start); |
|
|
|
instance.add(dayType, receivePeriod); |
|
|
|
instance.add(Calendar.DATE, -1); |
|
|
|
timeVo.setEndDate(instance.getTime()); |
|
|
|
|
|
|
|
System.out.println(sd.format(instance.getTime())); |
|
|
|
// System.out.println(sd.format(instance.getTime())); |
|
|
|
|
|
|
|
//自然月 |
|
|
|
if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
|
if(count == 0){ |
|
|
|
timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); |
|
|
|
if(receivePeriod == 1) { //周期1个月 头一个月到当月底 |
|
|
|
timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate())); |
|
|
|
}else{ |
|
|
|
Date firstDay = DateUtils.getFirstDayForCurrMonth(start); |
|
|
|
instance.clear(); |
|
|
|
instance.setTime(firstDay); |
|
|
|
//最后一个期有余,加上残月,不整除时,最后一个月有余,否则为0 |
|
|
|
instance.add(dayType, receivePeriod); |
|
|
|
instance.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
timeVo.setEndDate(instance.getTime()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|