Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -3008,7 +3008,7 @@ public class OrderController : BaseController
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == false, d => d.NearlyExpiredTime < DateTime.Now && d.ExpiredTime > DateTime.Now)//即将超期 未办
             .Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
-            .Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State == 0) == false)
+            .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId  == d.Id).NotAny())
             .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 

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

@@ -60,7 +60,7 @@
     }
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": true,
+    "ApplyDbMigrations": false,
     "ApplySeed": false
   },
   "MqConfiguration": {

src/Hotline.Share/Enums/Order/ESource.cs

@@ -12,7 +12,7 @@ public enum ESource
     /// <summary>
     /// 门户网站
     /// </summary>
-    WebPortal=2,
+    WebPortal = 2,
 
     /// <summary>
     /// 热线平台导入工单
@@ -30,14 +30,29 @@ public enum ESource
     Police110 = 200,
 
     /// <summary>
-    /// 泸州工单互转、 市州互转-宜宾、泸州市州互转工单
+    /// 市州互转--泸州 
     /// </summary>
     CityDataExchangeLz = 300,
 
+    /// <summary>
+    /// 市州互转--宜宾
+    /// </summary>
+    CityDataExchangeYB = 301,
+
+    /// <summary>
+    /// 市州互转--自贡
+    /// </summary>
+    CityDataExchangeZG = 302,
+
+    /// <summary>
+    /// 市州互转--内江
+    /// </summary>
+    CityDataExchangeNJ = 303,
+
     /// <summary>
     /// 宜宾融媒体
     /// </summary>
-    ConvergenceMedia=400,
+    ConvergenceMedia = 400,
 
     /// <summary>
     /// i宜宾

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.76</Version>
+    <Version>1.0.77</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline/Orders/Order.cs

@@ -22,7 +22,7 @@ namespace Hotline.Orders
     /// </summary>
     [Description("工单")]
     [SugarIndex("unique_order_no", nameof(Order.No), OrderByType.Desc, true)]
-    public partial class Order : PositionWorkflowEntity
+	public partial class Order : PositionWorkflowEntity
     {
         public Order()
         {

src/XF.Domain.Repository/Entity.cs

@@ -93,7 +93,7 @@ public abstract class SoftDeleteEntity : Entity, IHasDeletionTime, ISoftDelete
 public abstract class CreationSoftDeleteEntity : CreationEntity, IHasDeletionTime, ISoftDelete
 {
     [SugarColumn(ColumnDescription = "是否删除", DefaultValue = "f")]
-    public bool IsDeleted { get; set; }
+	public bool IsDeleted { get; set; }
 
     /// <summary>
     /// 删除时间