Merge branch 'feature-dgy-二期功能' into feature-dgy-后台测试

Areas/Api/Controllers/v1/Main1/ExportExcelsController.cs

@@ -29,10 +29,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DownloadsListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = DownloadsListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> DownloadsListDo(string value)
+        private List<Dictionary<string, object>> DownloadsListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string CreateDate = data["CreateDate"].ToString(); //创建时间
@@ -57,8 +58,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 condition += " and FileUrl like '%" + FileUrl + "%'";
             }
             List<RelationData> relationData = new List<RelationData>();
+            Other = new Dictionary<string, object>();
+            int count = 0;
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = ExportExcelsService.List(relationData, condition, pageNum, pageSize);
+            List<Dictionary<string, object>> source = ExportExcelsService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
@@ -69,6 +72,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
 
                 dataList.Add(curData);
             }
+            Other.Add("Count", count); //总数
             return dataList;
         }
         #endregion