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

src/Hotline.Api/Controllers/AiController.cs

@@ -243,6 +243,7 @@ namespace Hotline.Api.Controllers
                             aiOrderVisit.VisitedFailCount++;
                             //处理回访主表
                             aiOrderVisitDetail.OrderVisit.AiVisitTime();
+                            aiOrderVisitDetail.OrderVisit.AiVisitCount++;
                             aiOrderVisitDetail.OrderVisit.IsCanAiVisit = true;
                             await _orderVisitRepository.UpdateAsync(aiOrderVisitDetail.OrderVisit, HttpContext.RequestAborted);
                         }

src/Hotline.Api/Controllers/OrderController.cs

@@ -589,6 +589,7 @@ public class OrderController : BaseController
                 x => x.VisitState == Share.Enums.Order.EVisitState.Visited)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 x => x.Order.Title.Contains(dto.Keyword!) || x.Order.No.Contains(dto.Keyword!))
+            .WhereIF(dto.VisitType!=null,x=>x.VisitType== dto.VisitType)
             .WhereIF(dto.FiledType != null && dto.FiledType == FiledType.CenterFiled, d => d.Order.ProcessType == EProcessType.Zhiban)
             .WhereIF(dto.FiledType != null && dto.FiledType == FiledType.OrgFiled, d => d.Order.ProcessType == EProcessType.Jiaoban)
             .WhereIF(dto.IsCountersign != null && dto.IsCountersign == true, d => d.Order.CounterSignType != null)
@@ -598,6 +599,22 @@ public class OrderController : BaseController
         return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));
     }
 
+    /// <summary>
+    /// 回访查询基础数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("visit/basedata")]
+    public async Task<object> VisitBaseData()
+    {
+        var rsp = new
+        {
+            VisitType = EnumExts.GetDescriptions<EVisitType>(),
+        };
+        return rsp;
+    }
+
+
+
     /// <summary>
     /// 回访详情
     /// </summary>
@@ -705,7 +722,10 @@ public class OrderController : BaseController
         {
             visit.VisitState = Share.Enums.Order.EVisitState.Visited;
             visit.VisitTime = DateTime.Now;
-            visit.VisitType = EVisitType.ArtificialVisit;
+            if (visit.VisitType is null)
+            {
+                visit.VisitType = EVisitType.ArtificialVisit;
+            }
             if (first != null)
             {
                 visit.Order.Visited(first.OrgProcessingResults.Key, first.OrgProcessingResults.Value);

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

@@ -28,6 +28,11 @@ namespace Hotline.Share.Dtos.Order
         /// 是否会签
         /// </summary>
         public bool? IsCountersign { get; set; }
+
+        /// <summary>
+        /// 回访方式
+        /// </summary>
+        public EVisitType? VisitType { get; set; }
     }
 
     public record VisitDetailListDto : PagedKeywordRequest

src/Hotline/Orders/OrderVisit.cs

@@ -120,6 +120,7 @@ public class OrderVisit : CreationEntity
     [SugarColumn( DefaultValue = "0" )]
     public int AiVisitCount { get; set; }
 
+
     public void AiVisitTime()
     {
         LastVisitTime = DateTime.Now;