| @@ -18,6 +18,7 @@ public class PrintMerchantSettleDataHandler extends AbstractPrintDataParser { | |||||
| @Override | @Override | ||||
| public Object getObjectValue(String name, Object o,Map<Long,WxMerchant> merchantMap,Map<Long,WxEnergyFees> feesMap) { | public Object getObjectValue(String name, Object o,Map<Long,WxMerchant> merchantMap,Map<Long,WxEnergyFees> feesMap) { | ||||
| PrintMerchantSettleVo receive = (PrintMerchantSettleVo) o; | PrintMerchantSettleVo receive = (PrintMerchantSettleVo) o; | ||||
| //根据科目来查询对应的信息 | |||||
| // if (name.equals("id")) { | // if (name.equals("id")) { | ||||
| // return receive.getId(); | // return receive.getId(); | ||||
| // }else if (name.equals("createtime")) { | // }else if (name.equals("createtime")) { | ||||
| @@ -666,20 +666,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| for (int i = 0; i < size; i++) { | for (int i = 0; i < size; i++) { | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| Date startDate; | Date startDate; | ||||
| //自然月 | |||||
| if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ | |||||
| if(i == 0){ //第一期 | |||||
| startDate = rentalStartDate; | |||||
| }else{ | |||||
| instance.setTime(rentalStartDate); | |||||
| instance.add(Calendar.MONTH, month * i); | |||||
| startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); | |||||
| } | |||||
| }else{ | |||||
| // //自然月 | |||||
| // if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ | |||||
| // if(i == 0){ //第一期 | |||||
| // startDate = rentalStartDate; | |||||
| // }else{ | |||||
| // instance.setTime(rentalStartDate); | |||||
| // instance.add(Calendar.MONTH, month * i); | |||||
| // startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); | |||||
| // } | |||||
| // }else{ | |||||
| instance.setTime(rentalStartDate); | instance.setTime(rentalStartDate); | ||||
| instance.add(Calendar.MONTH, month * i); | instance.add(Calendar.MONTH, month * i); | ||||
| startDate = instance.getTime(); | startDate = instance.getTime(); | ||||
| } | |||||
| // } | |||||
| yearList.add(startDate); | yearList.add(startDate); | ||||
| } | } | ||||
| Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); | Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); | ||||
| @@ -1029,20 +1029,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| for (int i = 0; i < years; i++) { | for (int i = 0; i < years; i++) { | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| Date startDate; | Date startDate; | ||||
| //自然月 | |||||
| if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ | |||||
| if(i == 0){ //第一期 | |||||
| startDate = rentalStartDate; | |||||
| }else{ | |||||
| instance.setTime(rentalStartDate); | |||||
| instance.add(Calendar.MONTH, month * i); | |||||
| startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); | |||||
| } | |||||
| }else{ | |||||
| // //自然月 | |||||
| // if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ | |||||
| // if(i == 0){ //第一期 | |||||
| // startDate = rentalStartDate; | |||||
| // }else{ | |||||
| // instance.setTime(rentalStartDate); | |||||
| // instance.add(Calendar.MONTH, month * i); | |||||
| // startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); | |||||
| // } | |||||
| // }else{ | |||||
| instance.setTime(rentalStartDate); | instance.setTime(rentalStartDate); | ||||
| instance.add(Calendar.MONTH, month * i); | instance.add(Calendar.MONTH, month * i); | ||||
| startDate = instance.getTime(); | startDate = instance.getTime(); | ||||
| } | |||||
| // } | |||||
| yearList.add(startDate); | yearList.add(startDate); | ||||
| } | } | ||||