团组报表

更改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1250,7 +1250,7 @@ namespace OASystem.API.Controllers
                                 string ioaCurrencyCode = "Unknown";
                                 string ioaCurrencyName= "Unknown";
 
-                                var currencyData = currencyItems.Where(s => s.Id == invitationOfficialActivities.Currency && s.IsDel == 0).FirstOrDefault();
+                                var currencyData = currencyItems.Where(s => s.Id == invitationOfficialActivities.InviteCurrency && s.IsDel == 0).FirstOrDefault();
                                 if (currencyData != null)
                                 {
                                     ioaCurrencyCode = currencyData.Name;
@@ -1258,7 +1258,7 @@ namespace OASystem.API.Controllers
                                 }
 
                                 _detail.PriceNameContent = invitationOfficialActivities.InviterArea;
-                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCosts + " "+ ioaCurrencyCode + "("+ ioaCurrencyName+ ")<br/>" +
+                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCost + " "+ ioaCurrencyCode + "("+ ioaCurrencyName+ ")<br/>" +
                                                           "活动费用：- <br/>" +
                                                           "备注：" + invitationOfficialActivities.Remark + "<br/>";
 

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -212,7 +212,7 @@ namespace OASystem.API.Controllers
                 exTotalAmount = _ExtraCostsViews.Sum(it => it.CNYPrice);
 
                 _giView.ExtraCostsViews = _ExtraCostsViews;
-                _giView.ExtraCostsStr = string.Format(@"人名币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1());
+                _giView.ExtraCostsStr = string.Format(@"人名币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
                 /*
                  * 收款退还
                  */
@@ -402,13 +402,16 @@ namespace OASystem.API.Controllers
                 decimal JJCCNYTotalPrice = 0.00M, JJCPeopleNum = 0.00M, JJCAveragePrice = 0.00M;
                 decimal GWCCNYTotalPrice = 0.00M, GWCPeopleNum = 0.00M, GWCAveragePrice = 0.00M;
 
-                JJCCNYTotalPrice = groupAirFeeViews.Where(it => it.AirTypeName.Equals("经济舱")).Sum(it => it.CNYPrice);
-                JJCPeopleNum = groupAirFeeViews.Where(it => it.AirTypeName.Equals("经济舱")).Sum(it => it.ClientNum);
-                JJCAveragePrice = (JJCCNYTotalPrice / JJCPeopleNum).ConvertToDecimal1();
-                GWCCNYTotalPrice = groupAirFeeViews.Where(it => it.AirTypeName.Equals("公务舱")).Sum(it => it.CNYPrice);
-                GWCPeopleNum = groupAirFeeViews.Where(it => it.AirTypeName.Equals("公务舱")).Sum(it => it.ClientNum);
-                GWCAveragePrice = (GWCCNYTotalPrice / GWCPeopleNum).ConvertToDecimal1();
-
+                if (groupAirFeeViews.Count > 0)
+                {
+                    JJCCNYTotalPrice = groupAirFeeViews.Where(it => it.AirTypeName.Equals("经济舱")).Sum(it => it.CNYPrice);
+                    JJCPeopleNum = groupAirFeeViews.Where(it => it.AirTypeName.Equals("经济舱")).Sum(it => it.ClientNum);
+                    JJCAveragePrice = (JJCCNYTotalPrice / JJCPeopleNum).ConvertToDecimal1();
+                    GWCCNYTotalPrice = groupAirFeeViews.Where(it => it.AirTypeName.Equals("公务舱")).Sum(it => it.CNYPrice);
+                    GWCPeopleNum = groupAirFeeViews.Where(it => it.AirTypeName.Equals("公务舱")).Sum(it => it.ClientNum);
+                    GWCAveragePrice = (GWCCNYTotalPrice / GWCPeopleNum).ConvertToDecimal1();
+                }
+               
                 int Index = 0;
                 foreach (var item in groupAirFeeViews)
                 {

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -353,8 +353,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Inviter = dto.Inviter,
                         InviteTime = dto.InviteTime,
                         Attachment = dto.Attachment,
-                        InviteCosts = dto.InviteCosts,
-                        Currency = dto.Currency,
+                        InviteCost = dto.InviteCosts,
+                        InviteCurrency = dto.Currency,
                         SendCost = dto.SendCost,
                         IsGoOfficaiaBussiness = dto.IsGoOfficaiaBussiness,
                         Remark = dto.Remark,
@@ -403,13 +403,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 if (_TeamRate != null)
                                 {
 
-                                    if (grp_Invitation.Currency == 49)
+                                    if (grp_Invitation.InviteCurrency == 49)
                                     {
                                         grp_CreditCardPayment.DayRate = _TeamRate.RateU;
                                         grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney * Convert.ToDecimal(_TeamRate.RateU);
                                         //ccp.PayMoney = ccp.PayMoney * float.Parse(tr.RateU); 
                                     }
-                                    else if (grp_Invitation.Currency == 51)
+                                    else if (grp_Invitation.InviteCurrency == 51)
                                     {
                                         grp_CreditCardPayment.DayRate = _TeamRate.RateE;
                                         grp_CreditCardPayment.RMBPrice = grp_CreditCardPayment.PayMoney * Convert.ToDecimal(_TeamRate.RateE);
@@ -430,7 +430,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 {
                                     PayDId = dto.PayDId,
                                     PayMoney = grp_CreditCardPayment.PayMoney,
-                                    PaymentCurrency = grp_Invitation.Currency,
+                                    PaymentCurrency = grp_Invitation.InviteCurrency,
                                     Payee = dto.Payee,
                                     OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
                                     DayRate = grp_CreditCardPayment.DayRate,