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

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -1504,7 +1504,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         //任务 314 关于修改回访结果后回访人更新的问题
         if (_appOptions.Value.IsZiGong == true)
         {
-            if (string.IsNullOrEmpty(visit.EmployeeId))
+            //if (string.IsNullOrEmpty(visit.EmployeeId)||)
+            //    visit.EmployeeId = _sessionContext.UserId;
+            if(dto.IsUpdate==false)
                 visit.EmployeeId = _sessionContext.UserId;
         }
         else

src/Hotline/Orders/DatabaseEventHandler/OrderVisitDetailEventHandler.cs

@@ -45,34 +45,36 @@ public class OrderVisitDetailEventHandler : IUpdateDatabaseEvent<OrderVisitDetai
         var name = "回填Order回访字段";
         if (visit.VisitTarget == EVisitTarget.Org && visit.OrgProcessingResults != null)
         {
-            var orderId = _orderVisitRepository.Queryable()
-               .Where(m => m.Id == visit.VisitId)
-               .Select(m => new { m.OrderId, m.No, m.VisitState })
-               .First();
+            var orderEntity = _orderVisitRepository.Queryable()
+                .LeftJoin<Order>((vi, order) => vi.OrderId == order.Id)
+                .Where((vi, order) => vi.Id == visit.VisitId)
+                .Select((vi, order) => new { vi.OrderId, vi.No, vi.VisitState , order.Status})
+                .First();
 
-            if (visit.OrgProcessingResults.Value == "不满意" && orderId.VisitState!= EVisitState.Visited) return;
-           
-            _orderRepository.Updateable()
+            if (visit.OrgProcessingResults.Value == "不满意" && orderEntity.VisitState != EVisitState.Visited) return;
+
+            var count = _orderRepository.Updateable()
                 .SetColumns(m => m.OrgProcessingResults == visit.OrgProcessingResults)
-                .Where(m => m.Id == orderId.OrderId && m.Status >= EOrderStatus.Published)
+                .Where(m => m.Id == orderEntity.OrderId && m.Status >= EOrderStatus.Published)
                 .ExecuteCommand();
-            _systemLogRepository.Add(name, $"OrgProcessingResults: {visit.OrgProcessingResults.ToJson()}", orderId.No, orderId.No, 1);
+            _systemLogRepository.Add(name, $"OrgProcessingResults: {visit.OrgProcessingResults.ToJson()}", orderEntity.No, orderEntity.No, 1, $"受影响行数:{count} 工单状态: {orderEntity.Status}");
         }
 
         if (visit.VisitTarget == EVisitTarget.Seat && visit.SeatEvaluate != null)
         {
-            var orderId = _orderVisitRepository.Queryable()
-               .Where(m => m.Id == visit.VisitId)
-               .Select(m => new { m.OrderId, m.No,m.VisitState })
-               .First();
+            var orderEntity = _orderVisitRepository.Queryable()
+                .LeftJoin<Order>((vi, order) => vi.OrderId == order.Id)
+                .Where((vi, order) => vi.Id == visit.VisitId)
+                .Select((vi, order) => new { vi.OrderId, vi.No, vi.VisitState, order.Status })
+                .First();
+
+            if ((visit.SeatEvaluate == ESeatEvaluate.NoSatisfied || visit.SeatEvaluate == ESeatEvaluate.VeryNoSatisfied) && orderEntity.VisitState != EVisitState.Visited) return;
 
-            if ((visit.SeatEvaluate == ESeatEvaluate.NoSatisfied || visit.SeatEvaluate == ESeatEvaluate.VeryNoSatisfied) && orderId.VisitState!= EVisitState.Visited) return;
-           
-            _orderRepository.Updateable()
+            var count = _orderRepository.Updateable()
                 .SetColumns(m => m.SeatEvaluate == visit.SeatEvaluate)
-                .Where(m => m.Id == orderId.OrderId && m.Status >= EOrderStatus.Published)
+                .Where(m => m.Id == orderEntity.OrderId && m.Status >= EOrderStatus.Published)
                 .ExecuteCommand();
-            _systemLogRepository.Add(name, $"SeatEvaluate: {visit.SeatEvaluate}",orderId.No, orderId.No, 1);
+            _systemLogRepository.Add(name, $"SeatEvaluate: {visit.SeatEvaluate}", orderEntity.No, orderEntity.No, 1, $"受影响行数:{count} 工单状态: {orderEntity.Status}");
         }
 
     }