智能回访

src/Hotline.Api/Controllers/AiController.cs

@@ -594,40 +594,44 @@ namespace Hotline.Api.Controllers
 
                                         //    }
                                         //}
-                                        //是否联系
-                                        if (item.QuestionId == QuestionIdZero)
-                                        {
-                                            if (item.QuestionResult == "有联系")
-                                            {
-                                                isContact = true;
-                                            }
-                                            else if (item.QuestionResult == "没有联系")
-                                            {
-                                                isContact = false;
-                                            }
-                                        }
-                                        //是否解决
-                                        if (item.QuestionId == QuestionIdOne)
-                                        {
-                                            if (item.QuestionResult == "得到解决")
-                                            {
-                                                isSolve = true;
-                                            }
-                                            else if (item.QuestionResult == "未得到解决")
-                                            {
-                                                isSolve = false;
-                                            }
-                                        }
+                                        ////是否联系
+                                        //if (item.QuestionId == QuestionIdZero)
+                                        //{
+                                        //    if (item.QuestionResult == "有联系")
+                                        //    {
+                                        //        isContact = true;
+                                        //    }
+                                        //    else if (item.QuestionResult == "没有联系")
+                                        //    {
+                                        //        isContact = false;
+                                        //    }
+                                        //}
+                                        ////是否解决
+                                        //if (item.QuestionId == QuestionIdOne)
+                                        //{
+                                        //    if (item.QuestionResult == "得到解决")
+                                        //    {
+                                        //        isSolve = true;
+                                        //    }
+                                        //    else if (item.QuestionResult == "未得到解决")
+                                        //    {
+                                        //        isSolve = false;
+                                        //    }
+                                        //}
                                         //办件结果满意度
                                         if (item.QuestionId == QuestionIdTwo)
                                         {
                                             if (item.QuestionResult == "办件结果满意")
                                             {
                                                 orgProcessingResults = new Kv() { Key = "4", Value = "满意" };
+                                                isContact = true;
+                                                isSolve = true;
                                             }
                                             else if (item.QuestionResult == "办件结果不满意")
                                             {
                                                 orgProcessingResults = new Kv() { Key = "2", Value = "不满意" };
+                                                isContact = false;
+                                                isSolve = false;
                                                 visitContent = callRecord.SceneVariable != null ? callRecord.SceneVariable[VisitContentIdOne] : "";
                                             }
                                         }
@@ -674,13 +678,13 @@ namespace Hotline.Api.Controllers
                                     x.VisitContent = visitContent;
                                     x.Volved = isSolve;
                                     x.IsContact = isContact;
-                                    if (string.IsNullOrEmpty(orgProcessingResults?.Key) || isSolve == null || isContact == null ||  orgProcessingResults?.Value == "不满意")
+                                    if (string.IsNullOrEmpty(orgProcessingResults?.Key) ||  orgProcessingResults?.Value == "不满意")
                                     {
                                         //x.OrgNoSatisfiedReason = new List<Kv>() { new Kv() { Key = "7", Value = "未回复" } };
                                         //TODO 记录不满意原因到内容中供人工回访甄别选择不满意原因
-                                        if (dto.CallTimes.Value>=1 && orgProcessingResults == null && isSolve == null && isContact ==null)
+                                        if (dto.CallTimes.Value>=1 && orgProcessingResults == null)
                                         {
-                                            orgProcessingResults = new Kv() { Key = "0", Value = "默认满意" };
+                                            orgProcessingResults = new Kv() { Key = "6", Value = "未接通" };
                                             aiOrderVisitDetail.OrderVisit.VisitState = EVisitState.Visited;
                                             aiOrderVisitDetail.OrderVisit.NowEvaluate = orgProcessingResults;
                                             x.VisitContent = "智能回访两次未接默认已回访";
@@ -696,7 +700,7 @@ namespace Hotline.Api.Controllers
                                         }
                                         else
                                         {
-                                            aiOrderVisitDetail.OrderVisit.VisitState = Share.Enums.Order.EVisitState.WaitForVisit;
+                                            aiOrderVisitDetail.OrderVisit.VisitState = Share.Enums.Order.EVisitState.AiVisitWaitForVisit;
                                             aiOrderVisitDetail.OrderVisit.IsEffectiveAiVisit = false;
                                         }
                                         

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -3850,6 +3850,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         query = query.WhereIF(dto.VisitStateQuery == EVisitStateQuery.Visited, d => d.VisitState == EVisitState.Visited)
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSUnsatisfied, d => d.VisitState == EVisitState.SMSUnsatisfied)
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSVisiting, d => d.VisitState == EVisitState.SMSVisiting)
+            .WhereIF(dto.VisitStateQuery == EVisitStateQuery.AiVisitWaitForVisit,d=>d.VisitState == EVisitState.AiVisitWaitForVisit)
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoPutThrough,
                 d => d.IsPutThrough == false && d.VisitState != EVisitState.Visited && d.VisitState != EVisitState.None)
             .WhereIF(_appOptions.Value.IsZiGong && dto.VisitStateQuery == EVisitStateQuery.NoPutThrough,

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

@@ -697,6 +697,12 @@ namespace Hotline.Share.Dtos.Order
         [Description("短信回访中")]
         SMSVisiting = 21,
 
+        /// <summary>
+        /// 智能回访待处理
+        /// </summary>
+        [Description("智能回访待处理")]
+        AiVisitWaitForVisit = 23,
+
         /// <summary>
         /// 短信不满意待回访
         /// 逻辑需求(Task_317) : 若短信回访结果为不满意，回访状态需从“短信回访中”更新为“短信不满意待回访”

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

@@ -34,6 +34,12 @@ namespace Hotline.Share.Enums.Order
         [Description("智能回访中")]
         AiVisiting = 22,
 
+        /// <summary>
+        /// 智能回访待处理
+        /// </summary>
+        [Description("智能回访待处理")]
+        AiVisitWaitForVisit = 23,
+
         /// <summary>
         /// 已回访
         /// </summary>
@@ -50,7 +56,7 @@ namespace Hotline.Share.Enums.Order
         /// 短信不满意待回访
         /// 逻辑需求(Task_317) : 若短信回访结果为不满意，回访状态需从“短信回访中”更新为“短信不满意待回访”
         /// </summary>
-        [Description("短信不满意待回访")]
+        [Description("短信不满意待访")]
         SMSUnsatisfied = 41,
 
         /// <summary>