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

src/Hotline.Api/Controllers/OrderController.cs

@@ -2691,7 +2691,9 @@ public class OrderController : BaseController
             {
                 if (DateTime.Now > visitDetail.ScreenByEndTime && !_sessionContext.OrgIsCenter)
                 {
-                    throw UserFriendlyException.SameMessage("超过2个工作日不能申请甄别，不能申请");
+                    var mes = "超过截至甄别时间不能申请甄别！";
+                    mes = _appOptions.Value.IsLuZhou ? "回访完成的次月第一个工作日后不能再申请甄别！" : mes;
+					throw UserFriendlyException.SameMessage(mes);
                 }
             }
         }
@@ -3674,7 +3676,7 @@ public class OrderController : BaseController
         var (total, items) = await query
             .Includes(d => d.OrderScreens)
             .Where(d => d.Contact == dto.PhoneNo)
-            .WhereIF(_sessionContext.OrgIsCenter==false,d=>d.IsSecret==false)
+            .WhereIF(_sessionContext.OrgIsCenter == false && _appOptions.Value.IsYiBin == true, d => d.IsSecret == false)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .Select(d => new OrderHistoryOutDto
@@ -6422,8 +6424,7 @@ public class OrderController : BaseController
 
                 if (_appOptions.Value.IsLuZhou)
                 {
-                    startTime = order.ExpiredTime.Value;
-                    beginTime = startTime;
+                    startTime = DateTime.Now;
                 }
 
                 var expiredTime = await _expireTime.CalcEndTime(beginTime, startTime, order.AcceptTypeCode);

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1264,6 +1264,19 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             await _orderRepository.UpdateAsync(order, cancellationToken);
         }
 
+        //更新会签状态
+        if (_appOptions.Value.IsZiGong)
+        {
+            if (dto.Workflow.FlowDirection == EFlowDirection.CenterToOrg)
+            {
+                order.CounterSignType = dto.Workflow.NextHandlers.Count > 1 ? ECounterSignType.Center : null;
+            }
+            else if (dto.Workflow.FlowDirection == EFlowDirection.OrgToOrg)
+            {
+                order.CounterSignType = dto.Workflow.NextHandlers.Count > 1 ? ECounterSignType.Department : null;
+            }
+        }
+
 
         if (dto.Data.LeaderSMSKey != null)
         {