Merge branch 'feature_batchoutcall_dss' of Fengwo/hotline into dev

src/Hotline.Api/Controllers/AiController.cs

@@ -255,9 +255,9 @@ namespace Hotline.Api.Controllers
         [HttpGet("callout/list-basedata")]
         public async Task<object> AiCallOuttListBaseData()
         {
-            var aiCallOutTaskState = EnumExts.GetDescriptions<EAiCallOutTaskState>();
             return new {
-                AiCallOutTaskState = aiCallOutTaskState
+                AiCallOutTaskState = EnumExts.GetDescriptions<EAiCallOutTaskState>(),
+                AiCallOutState = EnumExts.GetDescriptions<EAiCallOutState>()
             };
         }
 
@@ -271,6 +271,9 @@ namespace Hotline.Api.Controllers
         {
             var (total, items) = await _callOutTaskDetailRepository.Queryable()
                 .Where(x => x.CallOutTaskId == dto.Id)
+                .WhereIF(!string.IsNullOrEmpty(dto.OuterNo),x=>x.OuterNo.Contains(dto.OuterNo))
+                .WhereIF(!string.IsNullOrEmpty(dto.Name),x=>x.Name.Contains(dto.Name))
+                .WhereIF(dto.AiCallOutState!=null,x=>x.AiCallOutState== dto.AiCallOutState)
                 .OrderByDescending(x => x.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
             return new PagedDto<AiCallOutDetailListRep>(total,_mapper.Map<IReadOnlyList<AiCallOutDetailListRep>>(items));

src/Hotline.Api/config/appsettings.Development.json

@@ -25,7 +25,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     //"Password": "fengwo22@@",
-    "Database": 3
+    "Database": 5
   },
   "Swagger": true,
   "Cors": {
@@ -60,7 +60,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": false,
+    "ApplyDbMigrations": true,
     "ApplySeed": false
   },
   "MqConfiguration": {

src/Hotline.Api/config/appsettings.json

@@ -25,7 +25,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo22@@",
-    "Database": 3
+    "Database": 5
   },
   "Swagger": true,
   "Cors": {

src/Hotline.Share/Dtos/Ai/AiDto.cs

@@ -13,6 +13,12 @@ namespace Hotline.Share.Dtos.Ai
     public record AiCallOutDetailListRequest:PagedRequest
     {
         public string Id { get; set; }
+
+        public string? OuterNo { get; set; }
+
+        public string? Name { get; set; }
+
+        public EAiCallOutState? AiCallOutState { get; set; }
     }