|
|
@@ -87,7 +87,7 @@ namespace Hotline.Application.TimeLimits
|
|
|
// list.Add(item);
|
|
|
// }
|
|
|
// }
|
|
|
- // if (list.Count>0)
|
|
|
+ // if (list.Count > 0)
|
|
|
// {
|
|
|
// //获取符合参数条件的组合最小时间单位
|
|
|
// var comHavMinParam = list.OrderBy(x => x.Hour).FirstOrDefault();
|
|
|
@@ -99,7 +99,7 @@ namespace Hotline.Application.TimeLimits
|
|
|
// {
|
|
|
// //获取符合参数条件的组合（工作日）最小单位
|
|
|
// var comHavMinParamWorkDay = list.OrderBy(x => x.Hour).FirstOrDefault(x => x.TimeLimit == ETimeType.WorkDay);
|
|
|
-
|
|
|
+
|
|
|
// //如果符合条件的组合和符合条件的组合（工作日）都存在
|
|
|
// if (comHavMinParam != null && comHavMinParamWorkDay != null)
|
|
|
// {
|
|
|
@@ -125,10 +125,10 @@ namespace Hotline.Application.TimeLimits
|
|
|
// {
|
|
|
// var firstModel = model.Priority.OrderBy(x => x.Sort).FirstOrDefault(x => param.Any(d => d.Key == x.Code && d.Value == x.ParamTypeValue));
|
|
|
// //如果找到排序条件 走排序逻辑
|
|
|
- // if (firstModel!=null)
|
|
|
+ // if (firstModel != null)
|
|
|
// {
|
|
|
// var CanUseModel = model.ParamArr?.FirstOrDefault(x => x.ParamType == firstModel.ParamType && x.Id == firstModel.Code);
|
|
|
- // if(CanUseModel!=null)
|
|
|
+ // if (CanUseModel != null)
|
|
|
// {
|
|
|
// #region 计算结束时间
|
|
|
// return CalcEndTime(BeginTime, CanUseModel.TimeLimitType, CanUseModel.TimeLimitValue);
|
|
|
@@ -141,18 +141,18 @@ namespace Hotline.Application.TimeLimits
|
|
|
|
|
|
// #region 配置优先级
|
|
|
// // 4>> 优先级 配置逻辑判定
|
|
|
- // if (model.ParamArr?.Count>0)
|
|
|
+ // if (model.ParamArr?.Count > 0)
|
|
|
// {
|
|
|
// //获取符合参数条件的配置最小时间单位
|
|
|
- // var havMinParam = model.ParamArr.OrderBy(x=>x.Hour).FirstOrDefault(x => x.TimeLimitType != ETimeType.WorkDay && param.Any(d => d.Key == x.ParamType && d.Value == x.Id));
|
|
|
+ // var havMinParam = model.ParamArr.OrderBy(x => x.Hour).FirstOrDefault(x => x.TimeLimitType != ETimeType.WorkDay && param.Any(d => d.Key == x.ParamType && d.Value == x.Id));
|
|
|
// //获取符合参数条件的配置（工作日）最小时间单位
|
|
|
// var havMinParamWorkDay = model.ParamArr.OrderBy(x => x.Hour).FirstOrDefault(x => x.TimeLimitType == ETimeType.WorkDay && param.Any(d => d.Key == x.ParamType && d.Value == x.Id));
|
|
|
// //如果符合条件的参数和符合条件的参数（工作日）都存在
|
|
|
- // if (havMinParam!=null && havMinParamWorkDay != null)
|
|
|
+ // if (havMinParam != null && havMinParamWorkDay != null)
|
|
|
// {
|
|
|
// var minParamResult = CalcEndTime(BeginTime, havMinParam.TimeLimitType, havMinParam.TimeLimitValue);
|
|
|
// var minParamWorkDayResult = CalcEndTime(BeginTime, havMinParam.TimeLimitType, havMinParam.TimeLimitValue);
|
|
|
- // if(minParamResult.EndTime != null && minParamWorkDayResult.EndTime != null && DateTime.Compare(minParamResult.EndTime.Value, minParamWorkDayResult.EndTime.Value) <= 0)
|
|
|
+ // if (minParamResult.EndTime != null && minParamWorkDayResult.EndTime != null && DateTime.Compare(minParamResult.EndTime.Value, minParamWorkDayResult.EndTime.Value) <= 0)
|
|
|
// {
|
|
|
// return minParamResult;
|
|
|
// }
|
admin