修复提现记录查询功能

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 提现记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string PayStatus, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -86,9 +86,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
-            if (data.QueryCount > 0)
+            //提交到代付状态
+            if (!string.IsNullOrEmpty(PayStatus))
             {
-                int QueryCount = data.QueryCount;
+                int QueryCount = int.Parse(function.CheckInt(PayStatus));
                 if (QueryCount == 2)
                 {
                     QueryCount = 0;
@@ -368,7 +369,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect)
+        public JsonResult ExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string PayStatus)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CashOrderNo", "1"); //提现单号
@@ -391,6 +392,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //提交到代付状态
+            if (!string.IsNullOrEmpty(PayStatus))
+            {
+                int QueryCount = int.Parse(function.CheckInt(PayStatus));
+                if (QueryCount == 2)
+                {
+                    QueryCount = 0;
+                }
+                condition += " and QueryCount=" + QueryCount;
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Views/MainServer/UserCashRecord/Index.cshtml

@@ -86,7 +86,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">提交代付状态</label>
                         <div class="layui-input-inline">
-                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                            <select id="PayStatus" name="PayStatus" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="2">待提交</option>
                                 <option value="1">已提交</option>