|
@@ -4192,12 +4192,12 @@ public class OrderController : BaseController
|
|
throw new UserFriendlyException($"该工单已开启办理流程, No:{order.No}", "该工单已开启办理流程");
|
|
throw new UserFriendlyException($"该工单已开启办理流程, No:{order.No}", "该工单已开启办理流程");
|
|
|
|
|
|
//交通工单校验
|
|
//交通工单校验
|
|
- // UpdateOrderDto upOrder = _mapper.Map<UpdateOrderDto>(order);
|
|
|
|
- //var valid = await _orderDomainService.OrderValidation(upOrder, HttpContext.RequestAborted);
|
|
|
|
- //if (valid.Validation)
|
|
|
|
- // throw UserFriendlyException.SameMessage(valid.Result);
|
|
|
|
|
|
+ // UpdateOrderDto upOrder = _mapper.Map<UpdateOrderDto>(order);
|
|
|
|
+ //var valid = await _orderDomainService.OrderValidation(upOrder, HttpContext.RequestAborted);
|
|
|
|
+ //if (valid.Validation)
|
|
|
|
+ // throw UserFriendlyException.SameMessage(valid.Result);
|
|
|
|
|
|
- ExpiredTimeWithConfig expiredTimeConfig;
|
|
|
|
|
|
+ ExpiredTimeWithConfig expiredTimeConfig;
|
|
var setting = _systemSettingCacheManager.GetSetting(SettingConstants.CityBaseConfiguration)?.SettingValue[0];
|
|
var setting = _systemSettingCacheManager.GetSetting(SettingConstants.CityBaseConfiguration)?.SettingValue[0];
|
|
CityBaseConfiguration cityBase = JsonSerializer.Deserialize<CityBaseConfiguration>(setting);
|
|
CityBaseConfiguration cityBase = JsonSerializer.Deserialize<CityBaseConfiguration>(setting);
|
|
if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase.CityProvince.OrgId || d.Key == cityBase.CityProvinceAssign.OrgId))
|
|
if (dto.Workflow.NextHandlers.Any(d => d.Key == cityBase.CityProvince.OrgId || d.Key == cityBase.CityProvinceAssign.OrgId))
|
|
@@ -5102,6 +5102,7 @@ public class OrderController : BaseController
|
|
.WhereIF(!string.IsNullOrEmpty(dto.StepName), d => d.ActualHandleStepName == dto.StepName)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.StepName), d => d.ActualHandleStepName == dto.StepName)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
|
|
.WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
|
|
.WhereIF(dto.Status.HasValue, d => d.Status == dto.Status)
|
|
.WhereIF(dto.Status.HasValue, d => d.Status == dto.Status)
|
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.SourceChannelCode), d => d.SourceChannelCode == dto.SourceChannelCode)//任务:308 市州通用-【中心待办件】新增“来源渠道”查询条件
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AcceptorName), d => d.AcceptorName!.Contains(dto.AcceptorName!))
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AcceptorName), d => d.AcceptorName!.Contains(dto.AcceptorName!))
|
|
.WhereIF(dto.ExpiredStatus is EExpiredStatus.Normal, d => DateTime.Now < d.NearlyExpiredTime)
|
|
.WhereIF(dto.ExpiredStatus is EExpiredStatus.Normal, d => DateTime.Now < d.NearlyExpiredTime)
|
|
.WhereIF(dto.ExpiredStatus is EExpiredStatus.GoingToExpired, d => DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
|
|
.WhereIF(dto.ExpiredStatus is EExpiredStatus.GoingToExpired, d => DateTime.Now > d.NearlyExpiredTime && DateTime.Now < d.ExpiredTime)
|
|
@@ -5130,8 +5131,8 @@ public class OrderController : BaseController
|
|
{ "orderStatus", EnumExts.GetDescriptions<EOrderStatus>() },
|
|
{ "orderStatus", EnumExts.GetDescriptions<EOrderStatus>() },
|
|
{ "expiredStatus", EnumExts.GetDescriptions<EExpiredStatus>() },
|
|
{ "expiredStatus", EnumExts.GetDescriptions<EExpiredStatus>() },
|
|
{ "stepNames", new string[] { "话务部", "派单组", "班长审批" } },
|
|
{ "stepNames", new string[] { "话务部", "派单组", "班长审批" } },
|
|
|
|
+ { "channelOptions", _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel)}//任务:308 市州通用-【中心待办件】新增“来源渠道”查询条件
|
|
};
|
|
};
|
|
-
|
|
|
|
if (_systemSettingCacheManager.Snapshot)
|
|
if (_systemSettingCacheManager.Snapshot)
|
|
{
|
|
{
|
|
var industry = await _industryRepository.Queryable()
|
|
var industry = await _industryRepository.Queryable()
|