Selaa lähdekoodia

部分代码调整

yuanrf 6 kuukautta sitten
vanhempi
commit
6c53b6576b

+ 1 - 1
OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -354,7 +354,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QuerySetDataInitByArr(QuerySetDataInitByArr Dto)
+        public IActionResult QuerySetDataInitByArr(QuerySetDataInitByArr Dto)
         {
            var DbQuery = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => Dto.DataTypeArr.Contains(s.STid)).ToList();
            var GroupResult =  DbQuery.GroupBy(x => x.STid).Select(x => new

+ 3 - 1
OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -924,7 +924,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         day++;
                     }
 
-                    if (exitMealCount > 0)
+                    var priceTypeArr = new int[] { 1061 , 1069 };
+
+                    if (exitMealCount > 0 && priceTypeArr.Contains(opSingle.PriceType))
                     {
                         remake = remake.TrimEnd(',');
                         remake += $"财政 {findSsetDataCurr?.Name} {aMeal} * {di.VisitPNumber} * {exitMealCount}餐";