+2

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10732,21 +10732,6 @@ ORDER by  gctggrc.id DESC
 
             var hrDtas = await _sqlSugar.Queryable<Grp_HotelReservations>()
                                         .Where(it => it.IsDel == 0 && it.DiId == _dto.DiId)
-                                        //.Select(x => new
-                                        //{
-                                        //    x.CreateTime,
-                                        //    x.CheckNumber,
-                                        //    x.ReservationsNo,
-                                        //    x.DetermineNo,
-                                        //    x.HotelName,
-                                        //    x.HotelAddress,
-                                        //    x.HotelTel,
-                                        //    x.HotelFax,
-                                        //    x.CheckInDate,
-                                        //    x.CheckOutDate,
-                                        //    x.GuestName,
-                                        //    x.RoomExplanation,
-                                        //})
                                         .OrderBy(x => x.CreateTime)
                                         .ToListAsync();
 
@@ -10840,10 +10825,16 @@ ORDER by  gctggrc.id DESC
                 borderHeader.DistanceFromText = 2;
                 borderHeader.LineStyle = Aspose.Words.LineStyle.Single;
 
-                //页眉加载图片
-                var image = Image.FromFile(voucherHeaderPath);
-                
-                builder.InsertImage(image, RelativeHorizontalPosition.Margin, 0, RelativeVerticalPosition.Margin, 0, 1.70, 2.70, WrapType.None);
+
+
+                if (System.IO.File.Exists(voucherHeaderPath))
+                {
+                    //页眉加载图片
+                    var image = Image.FromFile(voucherHeaderPath);
+
+                    builder.InsertImage(image, RelativeHorizontalPosition.Default, 1, RelativeVerticalPosition.Margin, 1, 1.20, 2.70, WrapType.Inline);
+                }
+               
 
                 #endregion
 

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -299,7 +299,8 @@ namespace OASystem.API.Controllers
                 //删除了  And prom.PriceType = 1
                 string _ropSql = string.Format(@"Select u.CnName As Appliction,prom.Id As PrId,prom.DiId As PrDiId,prom.Price As PrPrice,
 										         prom.PriceName AS PrPriceName,prom.CurrencyId As PrCurrencyId,
-										         prom.PayType As PrPayType,prom.PriceType As PrPriceType,ccp.*,prom.CreateTime As PrCreateTime
+										         prom.PayType As PrPayType,prom.PriceType As PrPriceType,
+												 ccp.RMBPrice * ccp.DayRate As RMBPrice,ccp.*,prom.CreateTime As PrCreateTime
 										         From Fin_PaymentRefundAndOtherMoney prom
 										         Left Join Grp_CreditCardPayment ccp On prom.DiId = ccp.DIId And prom.Id = ccp.CId
 										         Left Join Sys_Users u On ccp.CreateUserId = u.Id