泸州 任务196 关于省件发布时的优化

src/Hotline.Api/Controllers/OrderController.cs

@@ -413,7 +413,7 @@ public class OrderController : BaseController
         if (hasHuiQian)
             throw UserFriendlyException.SameMessage("选择的工单中含有会签工单, 不能批量发布. 请排除会签工单.");
 
-        var hasProvince = await _orderRepository.Queryable().AnyAsync(x => dto.Ids.Contains(x.Id) && x.IsProvince == true);
+        var hasProvince = await _orderRepository.Queryable().AnyAsync(x => dto.Ids.Contains(x.Id) && x.Source == ESource.ProvinceStraight);
         if (hasProvince)
             throw UserFriendlyException.SameMessage("选择的工单中含有省工单, 不能批量发布. 请排除省工单.");
 
@@ -769,11 +769,11 @@ public class OrderController : BaseController
     {
         //var query = _orderApplication.GetPublishedOrder(dto);
         //return (await query.ToFixedListAsync(dto.QueryIndex, 200, HttpContext.RequestAborted))
-            //.Adapt<List<PublishedDto>>();
-            var orderPublishs = await _orderApplication.GetPublishedOrder(dto)
-                .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
+        //.Adapt<List<PublishedDto>>();
+        var orderPublishs = await _orderApplication.GetPublishedOrder(dto)
+            .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
 
-            return _mapper.Map<IReadOnlyList<PublishedDto>>(orderPublishs);
+        return _mapper.Map<IReadOnlyList<PublishedDto>>(orderPublishs);
     }
 
     /// <summary>

src/Hotline.Application/Orders/OrderApplication.cs

@@ -733,7 +733,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 
               .WhereIF(dto.ExpiredTimeProvinceStart.HasValue, d => d.ExpiredTimeProvince >= dto.ExpiredTimeProvinceStart)//省期满时间开始
               .WhereIF(dto.ExpiredTimeProvinceEnd.HasValue, d => d.ExpiredTimeProvince <= dto.ExpiredTimeProvinceEnd)//省期满时间结束
-
+              .WhereIF(dto.Iszgzfw.HasValue && dto.Iszgzfw == true, d => d.ReceiveProvinceNo.StartsWith("ZGZFW"))
+              .WhereIF(dto.Isgjzwfwpt.HasValue && dto.Isgjzwfwpt == true, d => d.ReceiveProvinceNo.StartsWith("GJZWFWPT"))
               .WhereIF(dto.QuerySelf.HasValue && dto.QuerySelf.Value, d => d.WaitForPublisherId == _sessionContext.RequiredUserId)
                .WhereIF(dto.IdentityType != null, d => d.IdentityType == dto.IdentityType) //来电主体
               .WhereIF(dto.IsOverTime == true,

src/Hotline.Share/Dtos/Order/Publish/QueryOrderPublishDto.cs

@@ -5,35 +5,35 @@ namespace Hotline.Share.Dtos.Order.Publish;
 
 public record QueryOrderPublishDto : PagedKeywordRequest
 {
-	/// <summary>
-	/// 发布状态
-	/// </summary>
-	public EPubState? PubState { get; set; }
-
-	/// <summary>
-	/// 工单编号
-	/// </summary>
-	public string? No { get; set; }
-
-	/// <summary>
-	/// 工单标题
-	/// </summary>
-	public string? Title { get; set; }
-
-	/// <summary>
-	/// 受理时间(工单创建时间)
-	/// </summary>
-	public DateTime? CreationTimeStart { get; set; }
-	public DateTime? CreationTimeEnd { get; set; }
-
-	/// <summary>
-	/// 省期满时间开始
-	/// </summary>
-	public DateTime? ExpiredTimeProvinceStart { get; set; }
-
-	/// <summary>
-	/// 省期满时间结束
-	/// </summary>
+    /// <summary>
+    /// 发布状态
+    /// </summary>
+    public EPubState? PubState { get; set; }
+
+    /// <summary>
+    /// 工单编号
+    /// </summary>
+    public string? No { get; set; }
+
+    /// <summary>
+    /// 工单标题
+    /// </summary>
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// 受理时间(工单创建时间)
+    /// </summary>
+    public DateTime? CreationTimeStart { get; set; }
+    public DateTime? CreationTimeEnd { get; set; }
+
+    /// <summary>
+    /// 省期满时间开始
+    /// </summary>
+    public DateTime? ExpiredTimeProvinceStart { get; set; }
+
+    /// <summary>
+    /// 省期满时间结束
+    /// </summary>
     public DateTime? ExpiredTimeProvinceEnd { get; set; }
 
     /// <summary>
@@ -41,101 +41,101 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// </summary>
     public string? FromPhone { get; set; }
 
-	/// <summary>
-	/// 接办名称（综合查询使用）
-	/// </summary>
-	public string? ActualHandleOrgName { get; set; }
-
-	/// <summary>
-	/// 受理类型
-	/// </summary>
-	public List<string>? AcceptTypes { get; set; } = new();
-
-
-	/// <summary>
-	/// 受理类型（√）
-	/// </summary>
-	public string? AcceptType { get; set; }
-
-	/// <summary>
-	/// 热点分类关键词
-	/// </summary>
-	public string? Hotspot { get; set; }
-
-	/// <summary>
-	/// 热点分类
-	/// </summary>
-	public List<string>? HotspotIds { get; set; } = new();
-
-	/// <summary>
-	/// 受理坐席名字或工号（×）
-	/// </summary>
-	public string? NameOrNo { get; set; }
-
-	/// <summary>
-	/// 派单人
-	/// </summary>
-	public string? CenterToOrgHandlerName { get; set; }
-
-	/// <summary>
-	/// 发布范围
-	/// </summary>
-	public EPublicState? PubRange { get; set; }
-
-	/// <summary>
-	/// 归档时间
-	/// </summary>
-	public DateTime? FiledTimeStart { get; set; }
-	public DateTime? FiledTimeEnd { get; set; }
-
-	/// <summary>
-	/// 工单标签
-	/// </summary>
-	public string? OrderTag { get; set; }
-
-	/// <summary>
-	/// 归档方式
-	/// </summary>
-	public FiledType? FiledType { get; set; }
-
-	/// <summary>
-	/// 是否会签
-	/// </summary>
-	public bool? IsCountersign { get; set; }
-
-	/// <summary>
-	/// 是否解决
-	/// </summary>
-	public bool? Resolve { get; set; }
-
-	/// <summary>
-	/// 是否只查询自己的待发布工单
-	/// </summary>
-	public bool? QuerySelf { get; set; }
-
-	/// <summary>
-	/// 是否省工单（空为全部  true为省工单 false为市工单）
-	/// </summary>
-	public bool? IsProvinceOrder { get; set; }
-
-	/// <summary>
-	/// 来源渠道（√）
-	/// </summary>
-	public string? Channel { get; set; }
-
-	/// <summary>
-	/// 是否超期
-	/// </summary>
-	public bool? IsOverTime { get; set; }
+    /// <summary>
+    /// 接办名称（综合查询使用）
+    /// </summary>
+    public string? ActualHandleOrgName { get; set; }
+
+    /// <summary>
+    /// 受理类型
+    /// </summary>
+    public List<string>? AcceptTypes { get; set; } = new();
+
+
+    /// <summary>
+    /// 受理类型（√）
+    /// </summary>
+    public string? AcceptType { get; set; }
+
+    /// <summary>
+    /// 热点分类关键词
+    /// </summary>
+    public string? Hotspot { get; set; }
+
+    /// <summary>
+    /// 热点分类
+    /// </summary>
+    public List<string>? HotspotIds { get; set; } = new();
+
+    /// <summary>
+    /// 受理坐席名字或工号（×）
+    /// </summary>
+    public string? NameOrNo { get; set; }
+
+    /// <summary>
+    /// 派单人
+    /// </summary>
+    public string? CenterToOrgHandlerName { get; set; }
+
+    /// <summary>
+    /// 发布范围
+    /// </summary>
+    public EPublicState? PubRange { get; set; }
+
+    /// <summary>
+    /// 归档时间
+    /// </summary>
+    public DateTime? FiledTimeStart { get; set; }
+    public DateTime? FiledTimeEnd { get; set; }
+
+    /// <summary>
+    /// 工单标签
+    /// </summary>
+    public string? OrderTag { get; set; }
+
+    /// <summary>
+    /// 归档方式
+    /// </summary>
+    public FiledType? FiledType { get; set; }
+
+    /// <summary>
+    /// 是否会签
+    /// </summary>
+    public bool? IsCountersign { get; set; }
+
+    /// <summary>
+    /// 是否解决
+    /// </summary>
+    public bool? Resolve { get; set; }
+
+    /// <summary>
+    /// 是否只查询自己的待发布工单
+    /// </summary>
+    public bool? QuerySelf { get; set; }
+
+    /// <summary>
+    /// 是否省工单（空为全部  true为省工单 false为市工单）
+    /// </summary>
+    public bool? IsProvinceOrder { get; set; }
+
+    /// <summary>
+    /// 来源渠道（√）
+    /// </summary>
+    public string? Channel { get; set; }
+
+    /// <summary>
+    /// 是否超期
+    /// </summary>
+    public bool? IsOverTime { get; set; }
 
     /// <summary>
     /// 查询批次
     /// </summary>
     public int QueryIndex { get; set; }
 
-	/// <summary>
-	/// 一级部门
-	/// </summary>
+    /// <summary>
+    /// 一级部门
+    /// </summary>
     public string? OrgLevelOneName { get; set; }
 
     /// <summary>
@@ -143,4 +143,13 @@ public record QueryOrderPublishDto : PagedKeywordRequest
     /// </summary>
     public EIdentityType? IdentityType { get; set; }
 
+    /// <summary>
+    /// 中国政府网
+    /// </summary>
+    public bool? Iszgzfw { get; set; }
+
+    /// <summary>
+    /// 国家平台转办件
+    /// </summary>
+    public bool? Isgjzwfwpt { get; set; }
 }