我的账户增加收支类型筛选以及导出增加“账户结余”字段

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

@@ -818,6 +818,11 @@ public class cashbill extends Controller {
                 where = where + " and DATE_FORMAT(t1.checkdate,'%Y-%m-%d') <=DATE_FORMAT('" + whereObject.getString("enddate") + "','%Y-%m-%d')";
 
             }
+            if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {
+                where = where + " and t1.type ='" + whereObject.getString("type") + "' ";
+
+            }
+
 
         }
 
@@ -838,7 +843,6 @@ public class cashbill extends Controller {
         if (isExport) {
             //去除不需要导出项
             rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("balance");
             rows.getFieldList().remove("createby");
             rows.getFieldList().remove("createdate");
             Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
@@ -1059,6 +1063,7 @@ public class cashbill extends Controller {
         titleMap.put("type", "收支类型");
         titleMap.put("accountname", "账户名称");
         titleMap.put("amount", "收支金额");
+        titleMap.put("balance", "账户结余");
         titleMap.put("source", "凭证来源");
         titleMap.put("checkby", "审核人");
         titleMap.put("checkdate", "审核时间");