commonp

src/Hotline.Share/Dtos/Settings/TimeLimitDto.cs

@@ -76,14 +76,19 @@ namespace Hotline.Share.Dtos.Settings
     public class CombinationParamModel
     {
         /// <summary>
-        /// 组合参数ID
+        /// 参数类型Code
         /// </summary>
-        public string Id { get; set; }
+        public string Code { get; set; }
 
         /// <summary>
         /// 组合参数名称
         /// </summary>
         public string ParamName { get; set; }
+
+        /// <summary>
+        /// 组合参数值
+        /// </summary>
+        public string ParamValue { get; set; }
     }
 
 

src/Hotline/Settings/CommonOpinions/CommonOpinionTypeConsts.cs

@@ -28,9 +28,9 @@
         public const string Seat = "Seat";
 
         /// <summary>
-        /// 流转常用意见
+        /// 工单流转常用意见
         /// </summary>
-        public const string Circulation = "Circulation";
+        public const string OrderCirculation = "OrderCirculation";
 
         /// <summary>
         /// 回访常用意见

src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -28,13 +28,20 @@ namespace Hotline.Settings.TimeLimits
         }
 
 
-        //public async Task<(string, int)> Get(string WorkflowCode, DateTime BeginTime, Dictionary<string, string> param)
+        //public async Task Get(string WorkflowCode, DateTime BeginTime, Dictionary<string, string> param)
         //{
         //    //1>> 取出对应已启用的配置
         //    var model = await _timeLimitRepository.GetAsync(x => x.WorkflowCode == WorkflowCode && x.TimeLimitState == Share.Enums.Settings.ETimeLimitState.Enable);
         //    if (model != null)
         //    {
-
+        //        //组合逻辑
+        //        if (model.Combination.Count > 0)
+        //        {
+        //            foreach (var item in model.Combination)
+        //            {
+        //                item.CombinationParam.
+        //            }
+        //        }
         //    }
         //}