diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/BankInfoListReport.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/BankInfoListReport.java index 595f881..0e88c6d 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/BankInfoListReport.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/BankInfoListReport.java @@ -192,17 +192,17 @@ public class BankInfoListReport extends AbstractReportListDataPlugin implements //收款入账中心-流水 DataSet detailsDataSet = QueryServiceHelper.queryDataSet( this.getClass().getName() + "details", - "bei_intelrec","accountbank,bizdate,transbalance AS shjh_monthamt,modifytime AS shjh_datetimefield", + "bei_bankbalance","accountbank,bizdate,amount AS shjh_monthamt", qFilters2.toArray(new QFilter[]{}), null); //取最大日期 - DataSet maxDataSet=detailsDataSet.groupBy(new String[]{"accountbank"}).max("shjh_datetimefield").finish(); + DataSet maxDataSet=detailsDataSet.groupBy(new String[]{"accountbank"}).max("bizdate").finish(); //重新排序 maxDataSet=maxDataSet.join(detailsDataSet) .on("accountbank","accountbank") - .on("shjh_datetimefield","shjh_datetimefield") - .select(new String[]{"accountbank","shjh_monthamt","bizdate","shjh_datetimefield"}) + .on("bizdate","bizdate") + .select(new String[]{"accountbank","shjh_monthamt","bizdate"}) .finish(); //过滤金额=null的数据 maxDataSet=maxDataSet.filter("shjh_monthamt <> null"); @@ -217,7 +217,7 @@ public class BankInfoListReport extends AbstractReportListDataPlugin implements "shjh_fixedfield2","shjh_fixedfield3","shjh_monthamt", "shjh_exchangerate", "shjh_textfield", "shjh_fixedfield4","shjh_sfzl","shjh_province","shjh_city", "shjh_fixedfield5", "shjh_acctoutin","shjh_fixedfield6","shjh_fixedfield7", - "shjh_fixedfield8", "shjh_fixedfield9","shjh_fixedfield10","shjh_datetimefield"}) + "shjh_fixedfield8", "shjh_fixedfield9","shjh_fixedfield10"}) .finish(); return dataSet;