EnterExitCostMobileOpStep2 代码更改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -8010,7 +8010,7 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(false));
+                if (upd <1) return Ok(JsonView(false));
 
             }
 
@@ -8049,17 +8049,17 @@ FROM
 
             var infos1 = _mapper.Map<List<Grp_DayAndCost>>(dto.Infos);
             var infos = infos1.Select(x => new Grp_DayAndCost
-            {
-                Id = x.Id,
-                DiId = dto.DiId,
-                Type = dto.FeeType,
-                Days = x.Days,
-                NationalTravelFeeId = x.NationalTravelFeeId,
-                Cost = x.Cost,
-                Currency = x.Currency,
-                SubTotal = x.SubTotal,
-                CreateUserId = dto.CurrUserId
-            })
+                {
+                    Id = x.Id,
+                    DiId = dto.DiId,
+                    Type = dto.FeeType,
+                    Days = x.Days,
+                    NationalTravelFeeId = x.NationalTravelFeeId,
+                    Cost = x.Cost,
+                    Currency = x.Currency,
+                    SubTotal = x.SubTotal,
+                    CreateUserId = dto.CurrUserId
+                })
                 .ToList();
 
             var adds = infos.Where(x => x.Id <= 0).ToList();

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -4363,7 +4363,6 @@ WHERE
             return Ok(JsonView(true, "操作成功!", view));
         }
 
-
         /// <summary>
         ///  团组数据统计
         ///  团组数量
@@ -5196,7 +5195,6 @@ WHERE
             return Ok(JsonView(briefData, total));
         }
 
-
         /// <summary>
         ///  团组数据统计
         ///  当前时间团组所在城市   
@@ -5212,9 +5210,25 @@ WHERE
             var nowBool = DateTime.TryParse(nowLable, out DateTime now);
             if (!nowBool) return Ok(JsonView(false, $"请传入有效的当前时间(2024-11-27)!"));
 
-            var data = await _sqlSugar.Queryable<Grp_AirTicketReservations>()
+            #region 舱位类型
+            //457 头等舱
+            //458 公务舱
+            //459 超经舱
+            //460 经济舱
+            //461 退票
+            //565 其他
+            //574 长段公务舱
+            //575 短途经济舱
+            //1023    行程单打印费
+            //1024    选座费
+
+            var classTypes = new int[] { 457, 458, 459, 460, 574, 575 };
+
+            #endregion
+
+            var throughCities = await _sqlSugar.Queryable<Grp_AirTicketReservations>()
                 .LeftJoin<Grp_DelegationInfo>((atr, di) => atr.DIId == di.Id)
-                .Where((atr, di) => atr.IsDel == 0 && atr.FlightsDate.Trim().Equals(nowLable))
+                .Where((atr, di) => atr.IsDel == 0 && atr.FlightsDate.Trim().Equals(nowLable) && classTypes.Contains(atr.CType))
                 .Select((atr, di) => new
                 {
                     atr.DIId,
@@ -5222,10 +5236,10 @@ WHERE
                     atr.FlightsDate,
                     atr.FlightsCode,
                     atr.FlightsCity
-
                 })
                 .ToListAsync();
 
+            var cities = await _sqlSugar.Queryable<Res_ThreeCode>().Where(x => x.IsDel == 0).ToListAsync();
 
 
             return Ok(JsonView(false));