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

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -418,7 +418,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
             //var nextStepOption = CreateDynamicStep(startStep.InstancePolicy);
             //dto.Steps = new List<NextStepOption> { nextStepOption };
             //return dto;
-            var nextStepOption = await CreateDynamicStepAsync(startStep.InstancePolicy, cancellationToken);
+            var nextStepOption = await CreateDynamicStepAsync(startStep.InstancePolicy.Value, cancellationToken);
             return new NextStepsDto
             {
                 Steps = new List<NextStepOption> { nextStepOption }

src/Hotline.Share/Dtos/FlowEngine/Definition/StepDefineBasic.cs

@@ -63,7 +63,7 @@ namespace Hotline.Share.Dtos.FlowEngine.Definition
         /// <summary>
         /// 会签策略
         /// </summary>
-        public EDynamicPolicy CountersignPolicy { get; set; }
+        public EDynamicPolicy? CountersignPolicy { get; set; }
 
         #endregion
         
@@ -77,7 +77,7 @@ namespace Hotline.Share.Dtos.FlowEngine.Definition
         /// <summary>
         /// 动态实例化策略(多次模式才有)
         /// </summary>
-        public EDynamicPolicy InstancePolicy { get; set; }
+        public EDynamicPolicy? InstancePolicy { get; set; }
 
         /// <summary>
         /// 到此标记终止动态实例化(多次模式才有)

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

@@ -50,25 +50,35 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string No { get; set; }
 
-        /// <summary>
-        /// 省工单编号（冗余）
-        /// </summary>
-        public string? FromProvinceNo { get; set; }
+        ///// <summary>
+        ///// 省工单编号（冗余）
+        ///// </summary>
+        //public string? FromProvinceNo { get; set; }
+
+        ///// <summary>
+        ///// 同步省工单编号（按省工单要求生成的编号，冗余）
+        ///// </summary>
+        //public string? ToProvinceNo { get; set; }
 
         /// <summary>
-        /// 同步省工单编号（按省工单要求生成的编号，冗余）
+        /// 同步省工单编号和省上传下来的工单都用这个字段
         /// </summary>
-        public string? ToProvinceNo { get; set; }
+        public string? ProvinceNo { get; set; }
 
         /// <summary>
         /// 省过期时间（省工单才有）
         /// </summary>
         public DateTime? ExpiredTimeProvince { get; set; }
 
+        ///// <summary>
+        ///// 110工单编号（从110来的和推送给110的都用该字段记录唯一标识）
+        ///// </summary>
+        //public string? No110 { get; set; }
+
         /// <summary>
-        /// 110工单编号（从110来的和推送给110的都用该字段记录唯一标识）
+        /// 外部工单唯一标识
         /// </summary>
-        public string? No110 { get; set; }
+        public string? ExternalId { get; set; }
 
         /// <summary>
         /// 是否110来的工单

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

@@ -23,7 +23,7 @@ public enum ESource
     Police110 = 200,
 
     /// <summary>
-    /// 市州互转-宜宾、泸州市州互转工单
+    /// 泸州工单互转、 市州互转-宜宾、泸州市州互转工单
     /// </summary>
-    CityDataExchange = 300,
+    CityDataExchangeLz = 300,
 }

src/Hotline.Share/Hotline.Share.csproj

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

src/Hotline/Orders/Order.cs

@@ -518,6 +518,11 @@ namespace Hotline.Orders
         //[SugarColumn(IsNullable = true)]
         //public string? No110 { get; set; }
 
+        /// <summary>
+        /// 同步省工单编号和省上传下来的工单都用这个字段
+        /// </summary>
+        public string? ProvinceNo { get; set; }
+
         /// <summary>
         /// 外部工单唯一标识
         /// </summary>