20221022161304返回单据日期并支持日期筛选

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -901,6 +901,12 @@ public class cashbill extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where.append(" and t1.checkdate <='").append(getDate_Str(whereObject.getDate("enddate"), 1)).append("' ");
             }
+            if (whereObject.containsKey("begindate2") && !"".equals(whereObject.getString("begindate2"))) {
+                where.append(" and t1.billdate >='").append(whereObject.getString("begindate2")).append("' ");
+            }
+            if (whereObject.containsKey("enddate2") && !"".equals(whereObject.getString("enddate2"))) {
+                where.append(" and t1.billdate <='").append(getDate_Str(whereObject.getDate("enddate2"))).append("' ");
+            }
         }
 ////        boolean isExport = content.getBooleanValue("isExport");
 //        SQLFactory sqlFactory = new SQLFactory(this, "审核状态的收支凭证详情列表", pageSize, pageNumber, pageSorting);
@@ -912,7 +918,7 @@ public class cashbill extends Controller {
 //        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_cashbill", "billno", "type", "amount","discountamount", "remarks", "balance", "source", "checkby", "checkdate", "sa_accountclassid");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_cashbill", "billno", "type", "amount","discountamount", "remarks", "balance", "source", "checkby", "checkdate", "sa_accountclassid","billdate");
         querySQL.setTableAlias("t1");
         querySQL.addQueryFields("type_ch", "if(t1.type=1,'收入','支出')");
         querySQL.addQueryFields("unwriteoffamount", "t1.amount - t1.writeoffamount");