团组报表

修改 机票费用录入 人名问题

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -255,6 +255,7 @@ namespace OASystem.API.Controllers
 
                 _giView.ExtraCostsViews = _ExtraCostsViews;
                 _giView.ExtraCostsStr = string.Format(@"人名币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
+                
                 /*
                  * 收款退还
                  */
@@ -269,7 +270,7 @@ namespace OASystem.API.Controllers
 										         Left Join Sys_Users u On ccp.CreateUserId = u.Id
 										         Where prom.IsDel = 0  And prom.PayType = 1 And prom.PriceType = 1 And ccp.CTable = 285
 										         And ccp.IsAuditGM = 1 And ccp.IsPay = 1
-										         And prom.DiId =   {0}", _dto.DiId);
+										         And prom.DiId = {0}", _dto.DiId);
                 var _promDatas = await _sqlSugar.SqlQueryable<Gsd_PaymentRefundAndOtherMoneyDataSource1View>(_ropSql).ToListAsync();
                 
                 foreach (var ropItem in _promDatas)
@@ -517,11 +518,16 @@ namespace OASystem.API.Controllers
                                 string clientPinYinName = "";
                                 decimal unitCost = 0.00M;
                                 unitCost = (item.PayMoney / item.ClientNum).ConvertToDecimal1();
+
+                                int clienIndex = 1;
                                 foreach (var client in clients)
                                 {
                                     Index += 1;
-                                    int clienIndex = 1;
-                                    itemClientName += string.Format(@"{0}.{1} ;", clienIndex, client);
+                                    string six = "";
+                                    if (client.Sex == 0) six = "Mr";
+                                    else if (client.Sex == 1) six = "Ms";
+
+                                    itemClientName += string.Format(@"{0}.{1} {2};", clienIndex, client.LastName + client.FirstName, six);
                                     clientPinYinName += string.Format(@"{0}.{1}出票价为：{2} CNY;", Index, client.Pinyin, unitCost);
                                     clienIndex++;
                                 }
@@ -550,12 +556,7 @@ namespace OASystem.API.Controllers
                             
                             clientPinYinName += string.Format(@"{0}.{1}出票价为：{2} CNY;", Index, name, unitCost);
                         }
-                        
                     }
-
-
-                    
-
                     if (!string.IsNullOrEmpty(item.AuditGMDate))
                     {
                         item.AuditGMDate = Convert.ToDateTime(item.AuditGMDate).ToString("yyyy-MM-dd HH:mm:ss");

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -818,7 +818,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                 }
 
-                #region CCP 表参数 
+                #region CCP 表参数
+                if (_dto.PayDId == 72) //刷卡 默认已支付
+                {
+                    _CreditCardPayment.IsPay = 1;
+                }
                 _CreditCardPayment.CreateUserId = _dto.UserId;
                 _CreditCardPayment.DIId = _dto.DiId;
                 _CreditCardPayment.CTable = 76;
@@ -985,6 +989,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                     {
                                                        it.CTDId,
                                                        it.PayDId,
+                                                       it.IsPay,
                                                        it.ConsumptionPatterns,
                                                        it.ConsumptionDate,
                                                        it.PayMoney,