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

src/Hotline.Api/Controllers/OrderController.cs

@@ -456,8 +456,8 @@ public class OrderController : BaseController
         int visitCount = await _orderVisitRepository.CountAsync(
             x => x.OrderId == orderVisit.OrderId && x.VisitState == Share.Enums.Order.EVisitState.Visited,
             HttpContext.RequestAborted);
-        int againCount = await _orderVisitRepository.CountAsync(
-            x => x.OrderId == orderVisit.OrderId && x.AgainState == EAgainState.DoAgain, HttpContext.RequestAborted);
+        //int againCount = await _orderVisitRepository.CountAsync(
+        //    x => x.OrderId == orderVisit.OrderId && x.AgainState == EAgainState.DoAgain, HttpContext.RequestAborted);
         var voiceEvaluate = EnumExts.GetDescriptions<EVoiceEvaluate>();
         var seatEvaluate = EnumExts.GetDescriptions<ESeatEvaluate>();
         var visitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction);
@@ -468,7 +468,7 @@ public class OrderController : BaseController
         {
             OrderVisitModel = orderVisit,
             VisitCount = visitCount,
-            AgainCount = againCount,
+            //AgainCount = againCount,
             VisitSatisfaction = visitSatisfaction,
             DissatisfiedReason = dissatisfiedReason,
             VisitManner = visitManner,
@@ -522,15 +522,6 @@ public class OrderController : BaseController
 
         var first = dto.VisitDetails.FirstOrDefault(x => x.VisitTarget == EVisitTarget.Org);
 
-
-        //更新主表
-        if (dto.IsPutThrough)
-        {
-            visit.VisitState = Share.Enums.Order.EVisitState.Visited;
-            visit.VisitTime = DateTime.Now;
-            visit.VisitType = EVisitType.ArtificialVisit;
-        }
-
         visit.IsPutThrough = dto.IsPutThrough;
         visit.AgainState = dto.IsAgain ? EAgainState.NeedAgain : EAgainState.NoAgain;
         visit.EmployeeId = _sessionContext.UserId;
@@ -538,12 +529,13 @@ public class OrderController : BaseController
         {
             visit.NowEvaluate = first.OrgProcessingResults;
         }
-        //await _orderVisitRepository.UpdateAsync(visit,HttpContext.RequestAborted);
-
         //update order
         if (dto.IsPutThrough)
         {
-            if (first != null)
+	        visit.VisitState = Share.Enums.Order.EVisitState.Visited;
+	        visit.VisitTime = DateTime.Now;
+	        visit.VisitType = EVisitType.ArtificialVisit;
+			if (first != null)
             {
                 visit.Order.Visited(first.OrgProcessingResults.Key, first.OrgProcessingResults.Value);
             }
@@ -581,7 +573,6 @@ public class OrderController : BaseController
                         ClientGuid = ""
                     });
             }
-
             if (first != null)
             {
                 //写入质检
@@ -589,6 +580,7 @@ public class OrderController : BaseController
                     HttpContext.RequestAborted);
             }
         }
+        else { await _orderVisitRepository.UpdateAsync(visit, HttpContext.RequestAborted); }
     }
 
     /// <summary>

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

@@ -26,6 +26,11 @@ public class PublishedDto
     public DateTime? PublishTime { get; set; }
 
     public string? PublishMan { get; set; }
+
+    /// <summary>
+    /// 最近更新时间
+    /// </summary>
+    public DateTime? LastModificationTime { get; set; }
 }
 
 public class PublishDto : OrderDto
@@ -46,11 +51,6 @@ public class PublishDto : OrderDto
     public DateTime? PublishTime { get; set; }
 
     public string? PublishMan { get; set; }
-
-    /// <summary>
-    /// 最近更新时间
-    /// </summary>
-    public DateTime? LastModificationTime { get; set; }
 }