收支凭证性能优化

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

@@ -482,20 +482,22 @@ public class cashbill extends Controller {
             }
         }
         pageSorting = " sa_cashbillid desc";
+        int oldpageSize = pageSize;
         Rows rows = queryList(where, 1, "新建", pageSize).query();
         Rows checkRows = new Rows();
 
         if (rows.size() < pageSize) {
             checkRows = queryList(where, 1, "审核", pageSize - rows.size()).query();
         } else {
-            checkRows = queryList(where, 1, "审核", 0).query();
+            checkRows.totalRows = queryList(where, 1, "审核", 1).query().totalRows;
         }
         Rows voidRows = new Rows();
         if (rows.size() + checkRows.size() < pageSize) {
             voidRows = queryList(where, 1, "作废", pageSize - rows.size() - checkRows.size()).query();
         } else {
-            voidRows = queryList(where, 1, "作废", 0).query();
+            voidRows.totalRows = queryList(where, 1, "作废", 1).query().totalRows;
         }
+        rows.pageSize = oldpageSize;
         rows.addAll(checkRows);
         rows.addAll(voidRows);
         rows.totalRows = rows.totalRows + checkRows.totalRows + voidRows.totalRows;
@@ -569,25 +571,28 @@ public class cashbill extends Controller {
         }
 
         pageSorting = " sa_cashbillid desc";
+        int oldpageSize = pageSize;
         Rows rows = queryList(where, 0, "新建", pageSize).query();
         Rows checkRows = new Rows();
 
         if (rows.size() < pageSize) {
             checkRows = queryList(where, 0, "审核", pageSize - rows.size()).query();
         } else {
-            checkRows = queryList(where, 0, "审核", 0).query();
+            checkRows.totalRows = queryList(where, 0, "审核", 1).query().totalRows;
         }
         Rows voidRows = new Rows();
         if (rows.size() + checkRows.size() < pageSize) {
             voidRows = queryList(where, 0, "作废", pageSize - rows.size() - checkRows.size()).query();
         } else {
-            voidRows = queryList(where, 0, "作废", 0).query();
+            voidRows.totalRows = queryList(where, 0, "作废", 1).query().totalRows;
         }
+        rows.pageSize = oldpageSize;
         rows.addAll(checkRows);
         rows.addAll(voidRows);
         rows.totalRows = rows.totalRows + checkRows.totalRows + voidRows.totalRows;
         rows.totalPage = Double.valueOf(Math.ceil((double) rows.totalRows / (double) pageSize)).longValue();
 
+
         SQLFactory areasqlFactory = new SQLFactory(this, "收支凭证关联区域列表查询");
         areasqlFactory.addParameter("siteid", siteid);
         areasqlFactory.addParameter_in("sys_enterpriseids", rows.toArrayList("sys_enterpriseid", new ArrayList<>()));