|
@@ -1,10 +1,12 @@
|
|
-using Fw.Utility.UnifyResponse;
|
|
|
|
|
|
+using AngleSharp.Dom;
|
|
|
|
+using Fw.Utility.UnifyResponse;
|
|
using Hotline.Api.Filter;
|
|
using Hotline.Api.Filter;
|
|
using Hotline.Application.Orders;
|
|
using Hotline.Application.Orders;
|
|
using Hotline.Application.Snapshot;
|
|
using Hotline.Application.Snapshot;
|
|
using Hotline.Caching.Interfaces;
|
|
using Hotline.Caching.Interfaces;
|
|
using Hotline.File;
|
|
using Hotline.File;
|
|
using Hotline.Orders;
|
|
using Hotline.Orders;
|
|
|
|
+using Hotline.Repository.SqlSugar.Snapshot;
|
|
using Hotline.Settings;
|
|
using Hotline.Settings;
|
|
using Hotline.Share.Dtos;
|
|
using Hotline.Share.Dtos;
|
|
using Hotline.Share.Dtos.Article;
|
|
using Hotline.Share.Dtos.Article;
|
|
@@ -46,8 +48,9 @@ public class SnapshotController : BaseController
|
|
private readonly IOrderSnapshotRepository _orderSnapshotRepository;
|
|
private readonly IOrderSnapshotRepository _orderSnapshotRepository;
|
|
private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
|
|
private readonly ISystemDicDataCacheManager _systemDicDataCacheManager;
|
|
private readonly ISessionContext _sessionContext;
|
|
private readonly ISessionContext _sessionContext;
|
|
|
|
+ private readonly IThirdAccountRepository _thirdAccountRepository;
|
|
|
|
|
|
- public SnapshotController(IRepository<Order> orderRepository, ISnapshotApplication snapshotApplication, ISystemAreaDomainService systemAreaDomainService, IIndustryRepository industryRepository, IOrderDomainService orderDomainService, IFileRepository fileRepository, IOrderSnapshotRepository orderSnapshotRepository, ISystemDicDataCacheManager systemDicDataCacheManager, ISessionContext sessionContext)
|
|
|
|
|
|
+ public SnapshotController(IRepository<Order> orderRepository, ISnapshotApplication snapshotApplication, ISystemAreaDomainService systemAreaDomainService, IIndustryRepository industryRepository, IOrderDomainService orderDomainService, IFileRepository fileRepository, IOrderSnapshotRepository orderSnapshotRepository, ISystemDicDataCacheManager systemDicDataCacheManager, ISessionContext sessionContext, IThirdAccountRepository thirdAccountRepository)
|
|
{
|
|
{
|
|
_orderRepository = orderRepository;
|
|
_orderRepository = orderRepository;
|
|
_snapshotApplication = snapshotApplication;
|
|
_snapshotApplication = snapshotApplication;
|
|
@@ -58,6 +61,7 @@ public class SnapshotController : BaseController
|
|
_orderSnapshotRepository = orderSnapshotRepository;
|
|
_orderSnapshotRepository = orderSnapshotRepository;
|
|
_systemDicDataCacheManager = systemDicDataCacheManager;
|
|
_systemDicDataCacheManager = systemDicDataCacheManager;
|
|
_sessionContext = sessionContext;
|
|
_sessionContext = sessionContext;
|
|
|
|
+ _thirdAccountRepository = thirdAccountRepository;
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -116,6 +120,13 @@ public class SnapshotController : BaseController
|
|
orderSnapshot.CompanyName = dto.CompanyName;
|
|
orderSnapshot.CompanyName = dto.CompanyName;
|
|
if (dto.StartWorkTime.NotNullOrEmpty()) orderSnapshot.StartWorkTime = dto.StartWorkTime.ObjToDate();
|
|
if (dto.StartWorkTime.NotNullOrEmpty()) orderSnapshot.StartWorkTime = dto.StartWorkTime.ObjToDate();
|
|
if (dto.EndWorkTime.NotNullOrEmpty()) orderSnapshot.EndWorkTime = dto.EndWorkTime.ObjToDate();
|
|
if (dto.EndWorkTime.NotNullOrEmpty()) orderSnapshot.EndWorkTime = dto.EndWorkTime.ObjToDate();
|
|
|
|
+ if (dto.Name.NotNullOrEmpty())
|
|
|
|
+ {
|
|
|
|
+ await _thirdAccountRepository.Updateable()
|
|
|
|
+ .SetColumns(m => m.UserName, dto.Name)
|
|
|
|
+ .Where(m => m.Id == _sessionContext.UserId)
|
|
|
|
+ .ExecuteCommandAsync(HttpContext.RequestAborted);
|
|
|
|
+ }
|
|
await _orderSnapshotRepository.AddAsync(orderSnapshot);
|
|
await _orderSnapshotRepository.AddAsync(orderSnapshot);
|
|
return order.Adapt<AddSnapshotOrderOutDto>();
|
|
return order.Adapt<AddSnapshotOrderOutDto>();
|
|
}
|
|
}
|