修改是否交办字段 自动延期增加配置判断

src/Hotline.Api/Controllers/OrderController.cs

@@ -6109,14 +6109,14 @@ public class OrderController : BaseController
 
         if (_appOptions.Value.IsYiBin)
         {
-            if (order.ProcessType == EProcessType.Zhiban)
+            if (order.FileOrgIsCenter)
             {
                 var stepdDefault = step.Steps.Where(x => x.Key.ToLower() == "start").FirstOrDefault();
                 defaultStepKey = stepdDefault.Key;
                 defaultHandlerKey = stepdDefault.Handler.Key;
 
             }
-            if (order.ProcessType == EProcessType.Jiaoban)
+            if (!order.FileOrgIsCenter)
             {
                 if (step.Steps.Where(x => x.BusinessType == EBusinessType.Department && x.OrgLevel == 1).Any())
                 {

src/Hotline.Application/Orders/OrderApplication.cs

@@ -955,11 +955,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne, dto.Workflow.Opinion,
                 _sessionContextProvider.SessionContext.RequiredUserId, _sessionContextProvider.SessionContext.UserName,
                 canUpdateOrderSender);
-            //TODO发送短信即将超期
-            //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
-            //自动延期订阅
-            _capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
-                new PublishAutomaticDelayDto() { OrderId = order.Id });
+			//TODO发送短信即将超期
+			//_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+			//自动延期订阅
+			var enabled = _systemSettingCacheManager.GetSetting(SettingConstants.EnabledAutomaticDelay)?.SettingValue[0];
+			if (bool.Parse(enabled))
+			{
+				_capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
+					new PublishAutomaticDelayDto() { OrderId = order.Id });
+			}
         }
         else if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase?.Province12315?.OrgId) && !_appOptions.Value.IsYiBin)
         {
@@ -1015,11 +1019,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 expiredTimeConfig.NearlyExpiredTime, expiredTimeConfig.NearlyExpiredTimeOne, dto.Workflow.Opinion,
                 _sessionContextProvider.SessionContext.RequiredUserId, _sessionContextProvider.SessionContext.UserName,
                 canUpdateOrderSender);
-            //TODO发送短信即将超期
-            //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
-            //自动延期订阅
-            _capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
-                new PublishAutomaticDelayDto() { OrderId = order.Id });
+			//TODO发送短信即将超期
+			//_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+			//自动延期订阅
+			var enabled = _systemSettingCacheManager.GetSetting(SettingConstants.EnabledAutomaticDelay)?.SettingValue[0];
+			if (bool.Parse(enabled))
+			{
+				_capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
+					new PublishAutomaticDelayDto() { OrderId = order.Id });
+			}
         }
         else if (dto.Workflow.FlowDirection is EFlowDirection.CenterToCenter)
         {
@@ -1029,11 +1037,16 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 order.CenterToCenter(expiredTimeConfig.TimeText, expiredTimeConfig.Count,
                     expiredTimeConfig.TimeType, expiredTimeConfig.ExpiredTime, expiredTimeConfig.NearlyExpiredTime,
                     expiredTimeConfig.NearlyExpiredTimeOne);
-                //TODO发送短信即将超期
-                //_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
-                //自动延期订阅
-                _capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
-                    new PublishAutomaticDelayDto() { OrderId = order.Id });
+				//TODO发送短信即将超期
+				//_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
+				//自动延期订阅
+				var enabled = _systemSettingCacheManager.GetSetting(SettingConstants.EnabledAutomaticDelay)?.SettingValue[0];
+				if (bool.Parse(enabled))
+				{
+					_capPublisher.PublishDelay(expiredTimeConfig.ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay,
+						new PublishAutomaticDelayDto() { OrderId = order.Id });
+				}
+
             }
         }
         else if (dto.Workflow.FlowDirection is EFlowDirection.CenterToFile) //中心直接归档，中心意见为实际办理意见