|
|
|
@ -228,13 +228,13 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
|
|
|
|
|
//预计到账金额
|
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
|
|
cal.setTime(date);
|
|
|
|
|
cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 0, 0, 0);
|
|
|
|
|
cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 2, 0, 0);
|
|
|
|
|
Date datefrom = cal.getTime();
|
|
|
|
|
|
|
|
|
|
if (DateUtils.isSameDay(new Date(), datefrom)) {
|
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
|
params.put("datefrom", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
params.put("dateto", DateFormatUtils.format(DateUtils.addDays(datefrom, 1), "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
params.put("datefrom", DateFormatUtils.format(DateUtils.addDays(datefrom, -1), "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
params.put("dateto", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
|
|
|
|
List<JSONObject> lastDayClearingAmount = transactionMapper.getLastDaytransAmount(params);
|
|
|
|
|
BigDecimal total_clearing = BigDecimal.ZERO;
|
|
|
|
|