From 0125e321aac8faacdcf09de7cf443a373658e7e6 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Mon, 2 Dec 2024 09:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=90=8E=E6=97=B6=E7=9B=B8=20?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/AdminTaskManageApp.cs | 24 ++++++++++++++++++
 .../AdminTaskManageController.cs              | 25 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
index 16431b6..4c751e3 100644
--- a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
+++ b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
@@ -541,5 +541,29 @@ namespace OpenAuth.App.ServiceApp
 
             }
         }
+        /// <summary>
+        /// 选择前后时相
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<InsTif>>>> GteTifByTime(string name, DateTime beginTime, DateTime endTime, int page, int limit)
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                RefAsync<int> totalCount = 0;
+                var tif = await db.InsTif.AsQueryable()
+                    .WhereIF(!string.IsNullOrEmpty(name), (r) => r.TifName.Contains(name))
+                    .WhereIF(beginTime.Year != 0001, (r) => r.CreateTime >= beginTime && r.CreateTime <= endTime)
+                    .ToPageListAsync(page, limit, totalCount);
+                return new Response<PageInfo<List<InsTif>>>
+                {
+                    Result = new PageInfo<List<InsTif>>
+                    {
+                        Items = tif,
+                        Total = totalCount
+                    }
+                };
+
+            }
+        }
     }
 }
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
index 13da40c..79c7be1 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
@@ -173,7 +173,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="endTime">结束时间</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<AreaGroup>>> GteTif(string name, DateTime beginTime, DateTime endTime)
+        [NonAction]
+        public async Task<Response<List<AreaGroup>>> GteTifOld(string name, DateTime beginTime, DateTime endTime)
         {
             Response<List<AreaGroup>> response = new Response<List<AreaGroup>>();
             try
@@ -187,5 +188,27 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             }
             return response;
         }
+        /// <summary>
+        /// 选择前后时相
+        /// </summary>
+        /// <param name="name">名称</param>
+        /// <param name="beginTime">开始时间</param>
+        /// <param name="endTime">结束时间</param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<PageInfo<List<InsTif>>>> GteTifByTime(string name, DateTime beginTime, DateTime endTime, int page, int limit)
+        {
+            Response<PageInfo<List<InsTif>>> response = new Response<PageInfo<List<InsTif>>>();
+            try
+            {
+                return await _app.GteTifByTime(name, beginTime, endTime, page, limit);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
     }
 }