|
@@ -198,7 +198,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public ISugarQueryable<SignOrderSnapshotItemsOutDto> GetSignOrderSnapshotItemsAsync(SignOrderSnapshotItemsInDto dto)
|
|
|
+ public ISugarQueryable<LabelOrderSnapshotItemsOutDto> GetLabelOrderSnapshotItemsAsync(LabelOrderSnapshotItemsInDto dto)
|
|
|
{
|
|
|
var query = _orderSnapshotRepository.Queryable()
|
|
|
.LeftJoin<Order>((snapshot, order) => snapshot.Id == order.Id)
|
|
@@ -209,7 +209,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order, step) => order.No.Contains(dto.No))
|
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order, step) => order.Title.Contains(dto.Title))
|
|
|
.OrderByDescending((snapshot, order, step) => snapshot.CreationTime)
|
|
|
- .Select((snapshot, order) => new SignOrderSnapshotItemsOutDto
|
|
|
+ .Select((snapshot, order) => new LabelOrderSnapshotItemsOutDto
|
|
|
{
|
|
|
OrderId = snapshot.Id,
|
|
|
No = order.No,
|
|
@@ -222,8 +222,8 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
NetworkENumber = snapshot.NetworkENumber,
|
|
|
NetworkRemark = snapshot.NetworkRemark,
|
|
|
ReplyDate = snapshot.ReplyDate,
|
|
|
- SignTime = snapshot.SignTime,
|
|
|
- SignUserName = snapshot.SignUserName
|
|
|
+ LabelTime = snapshot.LabelTime,
|
|
|
+ LabelUserName = snapshot.LabelUserName
|
|
|
});
|
|
|
return query;
|
|
|
}
|
|
@@ -281,12 +281,16 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
snapshot.IsTruthDepartment = true;
|
|
|
if (labels.Any(m => m.Key == "bss"))
|
|
|
snapshot.IsTruthDepartment = false;
|
|
|
+ snapshot.LabelTime = DateTime.Now;
|
|
|
+ snapshot.LabelUserName = _sessionContext.UserName;
|
|
|
+ snapshot.LabelUserId = _sessionContext.UserId;
|
|
|
await _orderSnapshotRepository.UpdateAsync(snapshot);
|
|
|
|
|
|
- var entity = new SnapshotLabelLog {
|
|
|
- OrderId = snapshot.Id,
|
|
|
- LabelName = snapshot.LabelName,
|
|
|
- Labels = labels
|
|
|
+ var entity = new SnapshotLabelLog
|
|
|
+ {
|
|
|
+ OrderId = snapshot.Id,
|
|
|
+ LabelName = snapshot.LabelName,
|
|
|
+ Labels = labels
|
|
|
};
|
|
|
await _snapshotLabelLogRepository.AddAsync(entity);
|
|
|
}
|
|
@@ -346,23 +350,23 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public ISugarQueryable<SignOrderSnapshotLogItemsOutDto> GetSignOrderSnapshotLogItemsAsync(SignOrderSnapshotLogItemsInDto dto)
|
|
|
+ public ISugarQueryable<LabelOrderSnapshotLogItemsOutDto> GetLabelOrderSnapshotLogItemsAsync(LabelOrderSnapshotLogItemsInDto dto)
|
|
|
{
|
|
|
var query = _snapshotLabelLogRepository.Queryable()
|
|
|
.LeftJoin<Order>((log, order) => log.OrderId == order.Id)
|
|
|
.LeftJoin<OrderSnapshot>((log, order, snapshot) => log.OrderId == snapshot.Id)
|
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (log, order) => order.No.Contains(dto.No))
|
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (log, order) => order.Title.Contains(dto.Title))
|
|
|
- .WhereIF(dto.Contact.NotNullOrEmpty(), (log, order)=> order.Contact.Contains(dto.Contact))
|
|
|
- .WhereIF(dto.FromName.NotNullOrEmpty(), (log, order)=> order.FromName.Contains(dto.FromName))
|
|
|
- .WhereIF(dto.Label.NotNullOrEmpty(), (log, order)=> log.LabelName.Contains(dto.Label))
|
|
|
- .WhereIF(dto.SignName.NotNullOrEmpty(), (log, order) => log.CreatorName.Contains(dto.SignName))
|
|
|
+ .WhereIF(dto.Contact.NotNullOrEmpty(), (log, order) => order.Contact.Contains(dto.Contact))
|
|
|
+ .WhereIF(dto.FromName.NotNullOrEmpty(), (log, order) => order.FromName.Contains(dto.FromName))
|
|
|
+ .WhereIF(dto.Label.NotNullOrEmpty(), (log, order) => log.LabelName.Contains(dto.Label))
|
|
|
+ .WhereIF(dto.LabelUserName.NotNullOrEmpty(), (log, order) => log.CreatorName.Contains(dto.LabelUserName))
|
|
|
.WhereIF(dto.BeginSignTime.HasValue && dto.EndSignTime.HasValue, (log, order) => log.CreationTime >= dto.BeginSignTime && log.CreationTime <= dto.EndSignTime)
|
|
|
- .Select((log, order, snapshot) => new SignOrderSnapshotLogItemsOutDto
|
|
|
+ .Select((log, order, snapshot) => new LabelOrderSnapshotLogItemsOutDto
|
|
|
{
|
|
|
OrderId = order.Id,
|
|
|
- SignName = log.CreatorName,
|
|
|
- SignTime = log.CreationTime,
|
|
|
+ LabelUserName = log.CreatorName,
|
|
|
+ LabelTime = log.CreationTime,
|
|
|
IndustryName = snapshot.IndustryName
|
|
|
}, true);
|
|
|
return query;
|
|
@@ -425,7 +429,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order) => order.No.Contains(dto.No))
|
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order) => order.Title.Contains(dto.Title))
|
|
|
.WhereIF(dto.ActualHandleOrgName.NotNullOrEmpty(), (snapshot, order) => order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
|
|
|
- .Select((snapshot, order) => new OrderSnapshotItemsOutDto
|
|
|
+ .Select((snapshot, order) => new OrderSnapshotItemsOutDto
|
|
|
{
|
|
|
CreationTime = order.CreationTime
|
|
|
}
|
|
@@ -438,7 +442,7 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public ISugarQueryable<SignedOrderSnapshotItemsOutDto> GetSignedOrderSnapshotItemsAsync(SignedOrderSnapshotItemsInDto dto)
|
|
|
+ public ISugarQueryable<LabeledOrderSnapshotItemsOutDto> GetLabeledOrderSnapshotItemsAsync(LabeledOrderSnapshotItemsInDto dto)
|
|
|
{
|
|
|
var query = _orderSnapshotRepository.Queryable()
|
|
|
.LeftJoin<Order>((snapshot, order) => order.Id == snapshot.Id)
|
|
@@ -450,12 +454,12 @@ public class OrderSnapshotApplication : IOrderSnapshotApplication, IScopeDepende
|
|
|
.WhereIF(dto.Label.NotNullOrEmpty(), (snapshot, order) => snapshot.LabelName.Contains(dto.Label))
|
|
|
.WhereIF(dto.BeginSignTime.HasValue && dto.EndSignTime.HasValue, (snapshot, order) => snapshot.SignTime >= dto.BeginSignTime && snapshot.SignTime <= dto.EndSignTime)
|
|
|
.OrderByDescending((snapshot, order) => snapshot.CreationTime)
|
|
|
- .Select((snapshot, order) => new SignedOrderSnapshotItemsOutDto
|
|
|
- {
|
|
|
+ .Select((snapshot, order) => new LabeledOrderSnapshotItemsOutDto
|
|
|
+ {
|
|
|
LabelName = snapshot.LabelName,
|
|
|
OrderId = order.Id,
|
|
|
- SignTime = snapshot.SignTime,
|
|
|
- SignUserName = snapshot.SignUserName,
|
|
|
+ LabelTime = snapshot.LabelTime,
|
|
|
+ LabelUserName = snapshot.LabelUserName,
|
|
|
SourceChannel = order.SourceChannel,
|
|
|
}, true);
|
|
|
|