提成全部取消团组完成判断

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -5496,7 +5496,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  && auditState.Contains(b.IsAuditGM) && x.CheckType == 1001).Select((x, a, b) => new  // && a.IsSure == 1
                     {
                         a.Id,
                         a.TeamName,
@@ -5509,7 +5509,8 @@ Group by PriceType ", dto.diId);
                         x.OtherRoomCount,
                         x.CheckInDate,
                         x.CheckOutDate,
-                        x.HotelName
+                        x.HotelName,
+                        a.IsSure
                     }).ToList();
 
                 var groupByid = listHotel.GroupBy(x => x.Id);
@@ -5558,6 +5559,7 @@ Group by PriceType ", dto.diId);
                         VisitDate = groupinfo.VisitDate,
                         Temp = temp,
                         Price = totalPrice,
+                        State = groupinfo.IsSure,
                     });
                 }
 
@@ -5565,7 +5567,7 @@ Group by PriceType ", dto.diId);
             else if (OP.Contains(userId))
             {
                 var OPList = _sqlSugar.Queryable<Grp_DelegationInfo>().Where((a) => a.IsDel == 0
-                     && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime && a.IsSure == 1
+                     && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime // && a.IsSure == 1
                  ).ToList();
 
                 var LvArr = _sqlSugar.Queryable<Sys_SetData>().Where(x => x.STid == 70 && x.IsDel == 0).ToList();
@@ -5586,7 +5588,8 @@ Group by PriceType ", dto.diId);
                         TeamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate = groupinfo.VisitDate,
                         Temp = temp,
-                        Price = price
+                        Price = price,
+                        State = groupinfo.IsSure,
                     });
                 }
 
@@ -5600,7 +5603,7 @@ Group by PriceType ", dto.diId);
                 var officialList = _sqlSugar.Queryable<Res_OfficialActivities, Grp_DelegationInfo>((x, a) =>
                     new JoinQueryInfos(JoinType.Left, a.Id == x.DiId)
                 ).Where((x, a) => x.IsSubmitApproval == 0 && x.IsDel == 0 && a.IsDel == 0
-                    && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime && a.IsSure == 1
+                    && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime // && a.IsSure == 1
                 )
                 .Select((x, a) => new
                 {
@@ -5613,7 +5616,8 @@ Group by PriceType ", dto.diId);
                     x.Country,
                     x.Area,
                     x.Date,
-                    x.Client
+                    x.Client,
+                    a.IsSure,
                 })
                 .ToList();
 
@@ -5683,6 +5687,7 @@ Group by PriceType ", dto.diId);
                         VisitDate = groupinfo.VisitDate,
                         Temp = temp,
                         Price = money,
+                        State = groupinfo.IsSure,
                     });
                 }
             }
@@ -5696,7 +5701,7 @@ Group by PriceType ", dto.diId);
                     .And(
                         (x, a, b) => x.IsDel == 0 && x.CreateUserId == userId && (b.IsAuditGM == 1 || b.IsAuditGM == 3)
                         && a.IsDel == 0 && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime && b.IsDel == 0 && x.IsThird == 0 && x.PassengerType == 974
-                        && a.IsSure == 1 && auditState.Contains(b.IsAuditGM)
+                         && auditState.Contains(b.IsAuditGM) // && a.IsSure == 1
                     );
                 var listVisa = _sqlSugar.Queryable<Grp_VisaInfo, Grp_DelegationInfo, Grp_CreditCardPayment>((x, a, b) => new
                     JoinQueryInfos(
@@ -5715,7 +5720,8 @@ Group by PriceType ", dto.diId);
                     x.VisaDescription,
                     x.VisaFreeNumber,
                     x.VisaNumber,
-                    x.VisaPrice
+                    x.VisaPrice,
+                    a.IsSure,
                 })
                 .ToList();
 
@@ -5753,6 +5759,7 @@ Group by PriceType ", dto.diId);
                         VisitDate = groupinfo.VisitDate,
                         Temp = temp,
                         Price = money,
+                        State = groupinfo.IsSure,
                     });
                 }