Explorar el Código

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter hace 1 año
padre
commit
b16dbe2319
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver fichero

@@ -1025,7 +1025,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Override @Override
public List<Date> getYearList(int years,int month,Date rentalStartDate,Date endContractTime ) { public List<Date> getYearList(int years,int month,Date rentalStartDate,Date endContractTime ) {
List<Date> yearList = new ArrayList<>();
List<Date> yearList = new ArrayList<Date>();
for (int i = 0; i < years; i++) { for (int i = 0; i < years; i++) {
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(rentalStartDate); instance.setTime(rentalStartDate);
@@ -1033,6 +1033,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
Date startDate = instance.getTime(); Date startDate = instance.getTime();
if (null != endContractTime && endContractTime.before(startDate)) { if (null != endContractTime && endContractTime.before(startDate)) {
yearList.add(endContractTime); yearList.add(endContractTime);
break;
}else { }else {
yearList.add(startDate); yearList.add(startDate);
} }


Cargando…
Cancelar
Guardar