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

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1264,8 +1264,8 @@ namespace Hotline.Api.Controllers.Bi
                 .Where((it, o) => it.VisitTarget == EVisitTarget.Seat && o.VisitTime >= StartDate && o.VisitTime <= EndDate && o.VisitState == EVisitState.Visited)
                 .Select((it, o) => new Satisfaction
                 {
-                    Dissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(it.SeatEvaluate == ESeatEvaluate.VeryNoSatisfied || it.SeatEvaluate == ESeatEvaluate.NoSatisfied, 1, 0)),
-                    Satisfied = SqlFunc.AggregateSum(SqlFunc.IIF(it.SeatEvaluate != ESeatEvaluate.VeryNoSatisfied && it.SeatEvaluate != ESeatEvaluate.NoSatisfied, 1, 0)),
+                    Dissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF( it.SeatEvaluate == ESeatEvaluate.NoSatisfied, 1, 0)),
+                    Satisfied = SqlFunc.AggregateSum(SqlFunc.IIF(it.SeatEvaluate != ESeatEvaluate.NoSatisfied, 1, 0)),
                 }).ToListAsync();
 
             if (listSet != null && listSet.Count > 0)

src/Hotline.Api/Controllers/OrderController.cs

@@ -27,6 +27,7 @@ using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Enterprise;
 using Hotline.Share.Dtos.FlowEngine;
+using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Dtos.Settings;
 using Hotline.Share.Enums.CallCenter;
@@ -773,10 +774,14 @@ public class OrderController : BaseController
             var detaildto = dto.VisitDetails.FirstOrDefault(x => x.Id == detail.Id);
             if (detaildto != null)
             {
+                if (visit.Order.SourceChannelCode != "RGDH" && detaildto.VisitTarget == EVisitTarget.Seat)
+                {
+                    detaildto.SeatEvaluate = ESeatEvaluate.DefaultSatisfied;
+                }
                 _mapper.Map(detaildto, visit.OrderVisitDetails[i]);
             }
         }
-
+       
         await _orderVisitRepository.UpdateAsync(visit, HttpContext.RequestAborted);
         await _orderVisitedDetailRepository.UpdateRangeAsync(visit.OrderVisitDetails, HttpContext.RequestAborted);
         await _orderRepository.UpdateAsync(visit.Order, HttpContext.RequestAborted);
@@ -2268,7 +2273,7 @@ public class OrderController : BaseController
             var result = await _workflowDomainService.GetWorkflowHandlePermissionAsync(
                 order.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles,
                 cancellationToken: HttpContext.RequestAborted);
-            //order.Workflow = result.Workflow;
+            dto.Workflow = _mapper.Map<WorkflowDto>(result.Workflow);
             dto.CountersignId = result.CountersignId;
             dto.CanHandle = result.CanHandle;
             dto.CanPrevious = result.CanPrevious;

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

@@ -10,10 +10,15 @@ namespace Hotline.Share.Enums.Order
     public enum ESeatEvaluate
     {
         /// <summary>
-        /// 非常不满意
+        /// 默认满意
         /// </summary>
-        [Description("非常不满意")]
-        VeryNoSatisfied = 1,
+        [Description("默认满意")]
+        DefaultSatisfied = 0,
+        ///// <summary>
+        ///// 非常不满意
+        ///// </summary>
+        //[Description("非常不满意")]
+        //VeryNoSatisfied = 1,
 
         /// <summary>
         /// 不满意
@@ -21,11 +26,11 @@ namespace Hotline.Share.Enums.Order
         [Description("不满意")]
         NoSatisfied = 2,
 
-        /// <summary>
-        /// 一般
-        /// </summary>
-        [Description("一般")]
-        Normal = 3,
+        ///// <summary>
+        ///// 一般
+        ///// </summary>
+        //[Description("一般")]
+        //Normal = 3,
 
         /// <summary>
         /// 满意
@@ -39,6 +44,12 @@ namespace Hotline.Share.Enums.Order
         [Description("非常满意")]
         VerySatisfied = 5,
 
+        /// <summary>
+        /// 未接通
+        /// </summary>
+        [Description("未接通")]
+        NoConnect= 6,
+
         /// <summary>
         /// 未做评价
         /// </summary>