合并代码

src/Hotline.Application.Tests/Controller/OrderControllerTest.cs

@@ -106,24 +106,4 @@ public class OrderControllerTest : TestBase
         result.TimeText.ShouldBe("1个工作日");
         result.TimeType.ShouldBe(ETimeType.WorkDay);
     }
-
-    [Fact]
-    public async Task CreateOrder_Test()
-    {
-        await SetPaiDanYuan();
-        var orderDto = _fixture.Create<AddOrderDto>();
-        var hotspot = await _hotspotRepository.Queryable()
-            .OrderByDescending(m => m.CreationTime)
-            .FirstAsync();
-        orderDto.HotspotId = hotspot.Id;
-        orderDto.HotspotName = hotspot.HotSpotName;
-        orderDto.HotspotSpliceName = hotspot.HotSpotFullName;
-        orderDto.Files = new List<FileDto>();
-
-        var orderResult = await _orderController.Add(orderDto);
-        var orderId = orderResult.ToJson().FromJson<OrderDto>().Id;
-        var order = await _orderRepository.GetAsync(orderId);
-        order.ShouldNotBeNull();
-        order.CreatorId.ShouldBe(TestSessionConstants.UserId);
-    }
 }

src/Hotline.Application.Tests/TestBase.cs

@@ -41,6 +41,17 @@ public class TestBase
         await SetOperator("派单员", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Normal, TestSettingConstants.PaiDanYuanAccountName);
     }
 
+    public void Set一级部门()
+    {
+        SetOperator("部门经办人", "测试部门", "测试", "001094", "13408389849", EUserType.Seat, TestSettingConstants.FirstOrgAccountName);
+    }
+
+    public void Set二级部门()
+    {
+        SetOperator("部门经办人", "测试部门/测试二级部门", "cs21", "001094001", "13408389849", EUserType.Seat, TestSettingConstants.SecondOrgAccountName);
+    }
+
+
     public async Task SetZuoXi()
     {
         await SetOperator("坐席", "市民热线服务中心", "单元测试派单员", "001", "13408389849", EUserType.Seat, TestSettingConstants.PaiDanYuanAccountName);

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -169,15 +169,15 @@ public class OrderMapperConfigs : IRegister
             .IgnoreIf((s, d) => s.VisitDetail == null, d => d.VisitDetail)
             ;
 
-        config.ForType<OrderHandleFlowDto, Workflow>()
-            .Map(d => d.RealHandlerPhone, s => s.RealHandlerPhone)
-            .Map(d => d.RealHandlerName, s => s.RealHandlerName)
-            .Map(d => d.RealCommunicationMode, s => s.RealCommunicationMode)
-            .Map(d => d.RealCommunicationTime, s => s.RealCommunicationTime)
-            .Map(d => d.RealCommunicationAddress, s => s.RealCommunicationAddress)
-            .Map(d => d.RealIsContacted, s => s.RealIsContacted)
-            .Map(d => d.RealContactLocale, s => s.RealContactLocale)
-            .IgnoreNonMapped(true);
+        //config.ForType<OrderHandleFlowDto, Workflow>()
+        //    .Map(d => d.RealHandlerPhone, s => s.RealHandlerPhone)
+        //    .Map(d => d.RealHandlerName, s => s.RealHandlerName)
+        //    .Map(d => d.RealCommunicationMode, s => s.RealCommunicationMode)
+        //    .Map(d => d.RealCommunicationTime, s => s.RealCommunicationTime)
+        //    .Map(d => d.RealCommunicationAddress, s => s.RealCommunicationAddress)
+        //    .Map(d => d.RealIsContacted, s => s.RealIsContacted)
+        //    .Map(d => d.RealContactLocale, s => s.RealContactLocale)
+        //    .IgnoreNonMapped(true);
 
         config.ForType<OrderHandleFlowDto, Order>()
             .Map(src => src.RealCommunicationAddress, dest => dest.RealCommunicationAddress)

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -128,40 +128,40 @@ public partial class Workflow : CreationEntity
     [SugarColumn(Length = 8000)]
     public string ActualOpinion { get; set; } = "办理中...";
 
-    /// <summary>
-    /// 真实办理人姓名（手动填写）
-    /// </summary>
-    public string? RealHandlerName { get; set; }
+    ///// <summary>
+    ///// 真实办理人姓名（手动填写）
+    ///// </summary>
+    //public string? RealHandlerName { get; set; }
 
-    /// <summary>
-    /// 真实办理人电话（手动填写）
-    /// </summary>
-    public string? RealHandlerPhone { get; set; }
+    ///// <summary>
+    ///// 真实办理人电话（手动填写）
+    ///// </summary>
+    //public string? RealHandlerPhone { get; set; }
 
-    /// <summary>
-    /// 沟通方式（手动填写）
-    /// </summary>
-    public ERealCommunicationMode? RealCommunicationMode { get; set; }
+    ///// <summary>
+    ///// 沟通方式（手动填写）
+    ///// </summary>
+    //public ERealCommunicationMode? RealCommunicationMode { get; set; }
 
-    /// <summary>
-    /// 沟通时间（手动填写）
-    /// </summary>
-    public DateTime? RealCommunicationTime { get; set; }
+    ///// <summary>
+    ///// 沟通时间（手动填写）
+    ///// </summary>
+    //public DateTime? RealCommunicationTime { get; set; }
 
-    /// <summary>
-    /// 沟通地点（手动填写）
-    /// </summary>
-    public string? RealCommunicationAddress { get; set; }
+    ///// <summary>
+    ///// 沟通地点（手动填写）
+    ///// </summary>
+    //public string? RealCommunicationAddress { get; set; }
 
-    /// <summary>
-    /// 已与市民沟通
-    /// </summary>
-    public bool? RealIsContacted { get; set; }
+    ///// <summary>
+    ///// 已与市民沟通
+    ///// </summary>
+    //public bool? RealIsContacted { get; set; }
 
-    /// <summary>
-    /// 已与市民现场沟通
-    /// </summary>
-    public bool? RealContactLocale { get; set; }
+    ///// <summary>
+    ///// 已与市民现场沟通
+    ///// </summary>
+    //public bool? RealContactLocale { get; set; }
     #endregion
 
     #region 当前办理节点信息(指派时赋值)