Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -1887,7 +1887,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             ;
 
         query = query
-            .Includes(x => x.OrderSupervises.OrderByDescending(d => d.CreationTime).Take(2).ToList());
+            .Includes(x => x.OrderSupervises.OrderByDescending(d => d.CreationTime).Take(2).ToList())
+            .Includes(x => x.OrderVisits, d => d.OrderVisitDetails.Where(c => c.VisitTarget == EVisitTarget.Org).Take(1).ToList());
 
         return query;
     }
@@ -5686,22 +5687,22 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         return user;
     }
 
-	#endregion
+    #endregion
 
-	/// <summary>
-	/// 部门退回中心统计
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
+    /// <summary>
+    /// 部门退回中心统计
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
 
-	public ISugarQueryable<OrgSendBackAuditListVo> OrgSendBackAuditList(OrgSendBackAuditListDto dto) 
+    public ISugarQueryable<OrgSendBackAuditListVo> OrgSendBackAuditList(OrgSendBackAuditListDto dto)
     {
         var query = _orderSendBackAuditRepository.Queryable()
             .Where(x => x.State == ESendBackAuditState.End && x.ApplyOrgId != OrgSeedData.CenterId && x.SendBackOrgId == OrgSeedData.CenterId)
             .WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, x => x.AuditTime >= dto.StartTime && x.AuditTime <= dto.EndTime)
             .GroupBy(x => new { x.ApplyOrgId, x.ApplyOrgName })
             .Select(x => new OrgSendBackAuditListVo
-			{
+            {
                 OrgId = x.ApplyOrgId,
                 OrgName = x.ApplyOrgName,
                 Num = SqlFunc.AggregateCount(1)
@@ -5709,8 +5710,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         return query;
     }
 
-	public ISugarQueryable<OrderSendBackAudit> OrgSendBackAuditDetail(OrgSendBackAuditListDto dto)
-	{
+    public ISugarQueryable<OrderSendBackAudit> OrgSendBackAuditDetail(OrgSendBackAuditListDto dto)
+    {
         var query = _orderSendBackAuditRepository.Queryable()
                 .Includes(x => x.Order)
                 .Where(x => x.State == ESendBackAuditState.End && x.ApplyOrgId != OrgSeedData.CenterId && x.SendBackOrgId == OrgSeedData.CenterId)
@@ -5724,6 +5725,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .OrderByIF(dto is { SortField: "auditTime", SortRule: 0 }, x => x.AuditTime, OrderByType.Asc)
                 .OrderByIF(dto is { SortField: "auditTime", SortRule: 1 }, x => x.AuditTime, OrderByType.Desc)
             ;
-		return query;
-	}
+        return query;
+    }
 }

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

@@ -7,6 +7,7 @@ using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
 using Hotline.Share.Requests;
+using Hotline.Share.Tools;
 using Novacode;
 using XF.Utility.EnumExtensions;
 
@@ -1081,11 +1082,19 @@ namespace Hotline.Share.Dtos.Order
         /// 督办情况1
         /// </summary>
         public string? SuperviseInfo1 => OrderSupervises != null && OrderSupervises.Count > 0 ? OrderSupervises[0].CreationTime.ToString("yyyy-MM-dd HH:mm:ss") + "已通知" + OrderSupervises[0].OrgName : "";
-        
+
         /// <summary>
         /// 督办情况2
         /// </summary>
         public string? SuperviseInfo2 => OrderSupervises != null && OrderSupervises.Count > 1 ? OrderSupervises[1].CreationTime.ToString("yyyy-MM-dd HH:mm:ss") + "已通知" + OrderSupervises[1].OrgName : "";
+
+        /// <summary>
+        /// 不满意原因
+        /// </summary>
+        public string? orgNoSatisfiedReasonText =>
+            OrderVisits != null && OrderVisits.Count > 0 ?
+            OrderVisits.FirstOrDefault().OrderVisitDetails != null && OrderVisits.FirstOrDefault().OrderVisitDetails.Count > 0 ?
+            OrderVisits.FirstOrDefault().OrderVisitDetails.FirstOrDefault().OrgNoSatisfiedReasonText : "" : "";
     }
 
 

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

@@ -875,6 +875,16 @@ namespace Hotline.Share.Dtos.Order
         /// 是否回访结果修改
         /// </summary>
         public bool? IsUpdate { get; set; }
+
+        /// <summary>
+        /// 不满意原因
+        /// </summary>
+        public List<Kv>? OrgNoSatisfiedReason { get; set; }
+
+        /// <summary>
+        /// 回访对象类型 10：话务员 20：部门
+        /// </summary>
+        public EVisitTarget VisitTarget { get; set; }
     }
 
     public class OrderVisitDetailDto