超支部分调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -4224,6 +4224,11 @@ Group by PriceType ", dto.diId);
                         costRMBPrice = Convert.ToInt32(Math.Round(costPirce * costDayRate));
                     }
 
+                    if (remake.Contains("[TuT]"))
+                    {
+                        remake = remake.Replace("[TuT]", "");
+                    }
+
                     return new
                     {
                         x.PaymentCurrency,

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -983,6 +983,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                     if (exitMealCount > 0 && priceTypeArr.Contains(opSingle.PriceType))
                     {
+                        string searchKey = "宴请";
+
                         remake = remake.TrimEnd('，');
                         remake += $"财政 {findSetDataCurr?.Name} {aMeal} * {di.VisitPNumber} * {exitMealCount}餐";
                         remake += $",[TuT]{consumerMealStr} 共{consumerMealNumber}顿 {consumerMealAllPrice} {carCurr?.Name}";
@@ -1005,7 +1007,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             PriceType = 1028,
                             PriceDetailType = 1088,
                             Remark = remake,
-                            Area = opSingleCityId
+                            Area = opSingleCityId,
+                            SYsupervisorConfirm = dto.OPContentList.Where(x => x.priceContent.Contains(searchKey)).Count() > 0 ? 1 : 0,
                         });
                     }
 
@@ -1018,6 +1021,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             var ManagerConfirm = needToConfirm.Contains(item.PriceDetailType) ? 0 : 1;
                             var SupervisorConfirm = needToConfirm.Contains(item.PriceDetailType) ? 0 : 1;
                             var SYsupervisorConfirm = needToConfirm.Contains(item.PriceDetailType) ? 0 : 1;
+                            if (item.SYsupervisorConfirm > 0)
+                            {
+                                SYsupervisorConfirm = 1;
+                            }
+
                             var QuerySgin = _sqlSugar.Queryable<Fin_GroupExtraCost>()
                                 .Where(x => x.PriceName == item.PriceName && x.DiId == item.DiId && x.IsDel == 0 && x.PriceDt.ToString("yyyy-MM-dd") == item.PriceDt.ToString("yyyy-MM-dd"))
                                 .First();