Merge branch 'tianshuang' of Fengwo/hotline into master

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1927,9 +1927,9 @@ namespace Hotline.Api.Controllers.Bi
                            UserName = t1.UserName,
                            SendOrderNum = t1.SendOrderNum,
                            NoSendOrderNum = t1.NoSendOrderNum,
-                           ReSendOrderNum = t1_t2.Select(x => x.NoSendOrderNum).FirstOrDefault(),
-                           ChainRate = t1_t2.Select(x => x.NoSendOrderNum).FirstOrDefault() > 0 ?
-                                     ((double.Parse(t1.SendOrderNum.ToString()) - double.Parse(t1_t2.Select(x => x.NoSendOrderNum).FirstOrDefault().ToString())) / double.Parse(t1.SendOrderNum.ToString()) * 100).ToString("F2") + "%" : "100.00%",
+                           ReSendOrderNum = t1_t2.Select(x => x.ReSendOrderNum).FirstOrDefault(),
+                           ChainRate = t1_t2.Select(x => x.ReSendOrderNum).FirstOrDefault() > 0 ?
+                                     ((double.Parse(t1.SendOrderNum.ToString()) - double.Parse(t1_t2.Select(x => x.ReSendOrderNum).FirstOrDefault().ToString())) / double.Parse(t1.SendOrderNum.ToString()) * 100).ToString("F2") + "%" : "100.00%",
                        }).ToList();
 
             return res;

src/Hotline.Api/Controllers/OrderController.cs

@@ -2510,7 +2510,19 @@ public class OrderController : BaseController
                 NearlyExpiredTime = timeResult.NearlyExpiredTime
             };
         }
-        else
+        else if (dto.Workflow.FlowDirection == EFlowDirection.CenterToCenter)
+        {
+	        var timeResult = _timeLimitDomainService.CalcEndTime(DateTime.Now, ETimeType.WorkDay, 1, 0);
+	        expiredTimeConfig = new ExpiredTimeWithConfig
+	        {
+		        Count = 1,
+		        TimeType = ETimeType.WorkDay,
+		        TimeText = "1个工作日",
+		        ExpiredTime = timeResult.EndTime,
+		        NearlyExpiredTime = timeResult.NearlyExpiredTime
+	        };
+        }
+		else
         {
             //期满时间
             expiredTimeConfig = _timeLimitDomainService.CalcExpiredTime(DateTime.Now, EFlowDirection.CenterToOrg, dto.Data.AcceptTypeCode);