|
@@ -419,7 +419,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
|
|
var now = DateTime.Now;
|
|
var now = DateTime.Now;
|
|
//查询即将超期和超期工单
|
|
//查询即将超期和超期工单
|
|
var orderList = await _orderRepository.Queryable()
|
|
var orderList = await _orderRepository.Queryable()
|
|
- .Where(x=>x.NearlyExpiredTime> now && x.Status< EOrderStatus.Filed && !string.IsNullOrEmpty(x.CurrentHandleOrgId))
|
|
|
|
|
|
+ .Where(x=> x.Status< EOrderStatus.Filed && !string.IsNullOrEmpty(x.CurrentHandleOrgId))
|
|
.GroupBy(x=>x.CurrentHandleOrgId)
|
|
.GroupBy(x=>x.CurrentHandleOrgId)
|
|
.Select(x => new OverTimeOrderDto
|
|
.Select(x => new OverTimeOrderDto
|
|
{
|
|
{
|
|
@@ -431,6 +431,10 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
|
|
|
|
|
|
foreach (var item in orderList)
|
|
foreach (var item in orderList)
|
|
{
|
|
{
|
|
|
|
+ if (item.NearlyOrderCount==0 && item.ExpiredTimeOrderCount==0)
|
|
|
|
+ {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
|
|
var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
|
|
//查询部门所有账号
|
|
//查询部门所有账号
|
|
var userlist = await _userRepository.Queryable().Where(x =>
|
|
var userlist = await _userRepository.Queryable().Where(x =>
|