| @@ -11,10 +11,6 @@ public class WaitMerchantVo { | |||||
| @Excel(name="商户名",width = 20,orderNum = "1") | @Excel(name="商户名",width = 20,orderNum = "1") | ||||
| private String name; | private String name; | ||||
| @Excel(name="楼座",width = 20,orderNum = "2") | |||||
| private String building; | |||||
| @Excel(name="楼层",width = 20,orderNum = "3") | |||||
| private String floor; | |||||
| @Excel(name="负责人",width = 20,orderNum = "4") | @Excel(name="负责人",width = 20,orderNum = "4") | ||||
| private String linkPerson; | private String linkPerson; | ||||
| @Excel(name="负责人电话",width = 20,orderNum = "5") | @Excel(name="负责人电话",width = 20,orderNum = "5") | ||||
| @@ -948,8 +948,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| List<WaitMerchantVo> list = new ArrayList<>(); | List<WaitMerchantVo> list = new ArrayList<>(); | ||||
| for (Map<String, Object> map:data) { | for (Map<String, Object> map:data) { | ||||
| WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); | WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); | ||||
| oweMerchantVo.setBuilding((String)map.get("building")); | |||||
| oweMerchantVo.setFloor((String)map.get("floor")); | |||||
| oweMerchantVo.setLinkPerson((String)map.get("manager")); | oweMerchantVo.setLinkPerson((String)map.get("manager")); | ||||
| oweMerchantVo.setName((String)map.get("merchantName")); | oweMerchantVo.setName((String)map.get("merchantName")); | ||||
| oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); | oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); | ||||
| @@ -904,6 +904,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| && !isFirstDay(wxRentContract.getRentalStartDate()) | && !isFirstDay(wxRentContract.getRentalStartDate()) | ||||
| && (wxRentContract.getLease() % wxRentContract.getReceivePeriod() == 0) | && (wxRentContract.getLease() % wxRentContract.getReceivePeriod() == 0) | ||||
| && isLastYesr | && isLastYesr | ||||
| ){ | ){ | ||||
| paycount ++; | paycount ++; | ||||
| } | } | ||||
| @@ -1081,6 +1082,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillRent.setEndtime(wxRentContract.getRentalEndDate()); | wxBillRent.setEndtime(wxRentContract.getRentalEndDate()); | ||||
| } | } | ||||
| SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd"); | |||||
| System.out.println(s.format(wxBillRent.getStarttime())); | |||||
| System.out.println(s.format(wxBillRent.getEndtime())); | |||||
| int[] diff = DateUtils.getDiff(wxBillRent.getStarttime(),wxBillRent.getEndtime()); | int[] diff = DateUtils.getDiff(wxBillRent.getStarttime(),wxBillRent.getEndtime()); | ||||
| needpay = diff[0]*price; | needpay = diff[0]*price; | ||||