|
|
@@ -5035,7 +5035,7 @@ Group by PriceType ", dto.diId);
|
|
|
|
|
|
string errMsg = string.Empty;
|
|
|
|
|
|
- if (air.FlightsDescription.Contains("\r\n"))
|
|
|
+ if (air.FlightsDescription.Contains("\r\n") || Regex.Split(air.FlightsDescription, "\\d+\\.", RegexOptions.IgnoreCase).Count() > 1)
|
|
|
{
|
|
|
var rowCode = Regex.Split(air.FlightsDescription, "\\d+\\.", RegexOptions.IgnoreCase).Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
|
|
|
for (int i = 0; i < rowCode.Length; i++)
|
|
|
@@ -5133,7 +5133,7 @@ Group by PriceType ", dto.diId);
|
|
|
JoinType.Left, x.DiId == a.Id,
|
|
|
JoinType.Left, b.CTable == 76 && b.CId == x.Id))
|
|
|
.Where((x, a, b) => x.IsDel == 0 && x.CreateUserId == userId && a.VisitDate >= StartDateTime
|
|
|
- && a.VisitDate <= EndDateTime && a.IsDel == 0 && b.IsDel == 0 && x.CardPrice > 0 && a.IsSure == 1 && auditState.Contains(b.IsAuditGM) && x.CheckType == 1001).Select((x, a, b) => new
|
|
|
+ && a.VisitDate <= EndDateTime && a.IsDel == 0 && b.IsDel == 0 && x.CardPrice != 0 && a.IsSure == 1 && auditState.Contains(b.IsAuditGM) && x.CheckType == 1001).Select((x, a, b) => new
|
|
|
{
|
|
|
a.Id,
|
|
|
a.TeamName,
|
yuanrf