|
|
|
@@ -107,10 +107,17 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
HashMap<String, Object> rentMap = new HashMap<>(); |
|
|
|
Map<String, Object> params = new HashMap<>(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
Calendar calendar = Calendar.getInstance();//日历对象 |
|
|
|
calendar.setTime(new Date());//设置当前日期 |
|
|
|
calendar.add(Calendar.MONTH, -1);//月份减一 |
|
|
|
params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM")); |
|
|
|
|
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
instance.set(Calendar.DAY_OF_YEAR,1); |
|
|
|
instance.set(Calendar.HOUR_OF_DAY,0); |
|
|
|
instance.set(Calendar.MINUTE,0); |
|
|
|
instance.set(Calendar.SECOND,0); |
|
|
|
String startdate = DateUtils.date2String(instance); |
|
|
|
instance.clear(); |
|
|
|
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); |
|
|
|
params.put("startdate",startdate); |
|
|
|
params.put("enddate",enddate); |
|
|
|
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivableAmount = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
@@ -321,7 +328,16 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
HashMap<String, Object> billMap = new HashMap<>(); |
|
|
|
WxBillAll record = new WxBillAll(); |
|
|
|
record.setTenantId(tenantId); |
|
|
|
record.setMonth(DateUtils.getSystemTime("yyyy-MM")); |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
instance.set(Calendar.DAY_OF_YEAR,1); |
|
|
|
instance.set(Calendar.HOUR_OF_DAY,0); |
|
|
|
instance.set(Calendar.MINUTE,0); |
|
|
|
instance.set(Calendar.SECOND,0); |
|
|
|
String startdate = DateUtils.date2String(instance); |
|
|
|
instance.clear(); |
|
|
|
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); |
|
|
|
record.setStarttime(startdate); |
|
|
|
record.setEndtime(enddate); |
|
|
|
record.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
Map<String, Object> oweInfo = wxBillAllMapper.queryOweInfo(record); |
|
|
|
record.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
|
@@ -399,10 +415,16 @@ public class DataTowerServiceImpl implements DataTowerService { |
|
|
|
//租金 |
|
|
|
Map<String, Object> params = new HashMap<>(); |
|
|
|
params.put("tenantId", tenantId); |
|
|
|
Calendar calendar = Calendar.getInstance();//日历对象 |
|
|
|
calendar.setTime(new Date());//设置当前日期 |
|
|
|
calendar.add(Calendar.MONTH, -1);//月份减一 |
|
|
|
params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM")); |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
instance.set(Calendar.DAY_OF_YEAR,1); |
|
|
|
instance.set(Calendar.HOUR_OF_DAY,0); |
|
|
|
instance.set(Calendar.MINUTE,0); |
|
|
|
instance.set(Calendar.SECOND,0); |
|
|
|
String startdate = DateUtils.date2String(instance); |
|
|
|
instance.clear(); |
|
|
|
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); |
|
|
|
params.put("startdate",startdate); |
|
|
|
params.put("enddate",enddate); |
|
|
|
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params); |
|
|
|
if (payinfo != null) { |
|
|
|
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); |
|
|
|
|