Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2518,6 +2518,8 @@ public class OrderController : BaseController
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
+            .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true,d=>d.CounterSignType.HasValue)
+            .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false,d=>!d.CounterSignType.HasValue)
             .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -3794,7 +3796,18 @@ public class OrderController : BaseController
         }
     }
 
-
-
+    /// <summary>
+    /// 导入基础数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("import-basedata")]
+    public async Task<object> ImportBaseData()
+    {
+        var rsp = new
+        {
+            Source = EnumExts.GetDescriptions<ESource>(),
+        };
+        return rsp;
+    }
     #endregion
 }

src/Hotline.Share/Dtos/Order/OrderWaitedDto.cs

@@ -23,5 +23,5 @@ namespace Hotline.Share.Dtos.Order
         public DateTime? StepExpiredTime { get; set; }
     }
 
-    public record QueryOrderWaitedDto(bool? IsProvince, bool? IsHandled) : PagedKeywordRequest;
+    public record QueryOrderWaitedDto(bool? IsProvince, bool? IsHandled,bool? IsCounterSign) : PagedKeywordRequest;
 }