|
|
|
@ -365,9 +365,9 @@ namespace Myshipping.Application
|
|
|
|
|
beginDate = query.beginETD.Value;
|
|
|
|
|
|
|
|
|
|
if (query.endETD.HasValue)
|
|
|
|
|
endDate = query.beginETD.Value;
|
|
|
|
|
endDate = query.endETD.Value;
|
|
|
|
|
|
|
|
|
|
if (beginDate.AddDays(7) < endDate)
|
|
|
|
|
if (endDate > beginDate.AddDays(7))
|
|
|
|
|
throw Oops.Oh($"船期的日期范围不能超过7天");
|
|
|
|
|
|
|
|
|
|
queryWhere = queryWhere.Where(a => a.ETD >= beginDate && a.ETD < endDate.AddDays(1));
|
|
|
|
@ -389,7 +389,7 @@ namespace Myshipping.Application
|
|
|
|
|
if (query.endCreated.HasValue)
|
|
|
|
|
endDate = query.endCreated.Value;
|
|
|
|
|
|
|
|
|
|
if (beginDate.AddDays(7) < endDate)
|
|
|
|
|
if (endDate > beginDate.AddDays(7))
|
|
|
|
|
throw Oops.Oh($"制单的日期范围不能超过7天");
|
|
|
|
|
|
|
|
|
|
queryWhere = queryWhere.Where(a => a.CreatedTime >= beginDate && a.CreatedTime < endDate.AddDays(1));
|
|
|
|
|