签证客户公司

增加 全称，简称

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -744,8 +744,46 @@ namespace OASystem.API.Controllers
                                                              Left Join Sys_SetData sd1 On ccp.PaymentCurrency = sd1.Id
                                                              Left Join Sys_SetData sd2 On ccp.PayDId = sd2.Id
                                                              Left Join Sys_Users u On ccp.CreateUserId = u.Id
-                                                             Where dp.IsDel = 0 And ccp.IsAuditGM = 1 And ccp.IsPay = 1 And  dp.Diid = {0}",_dto.DiId);
+                                                             Where dp.IsDel = 0 And ccp.IsAuditGM = 1 And ccp.IsPay = 1 And dp.Diid = {0}",_dto.DiId);
                 groupDecreaseFeeViews = await _sqlSugar.SqlQueryable<GroupDecreaseFeeView>(groupDecreaseFeeSql).ToListAsync();
+
+                //模拟数据
+                if (groupDecreaseFeeViews.Count < 1)
+                {
+                    groupDecreaseFeeViews.Add(new GroupDecreaseFeeView()
+                    {
+                        DPId = 0,
+                        DPDiId = 2334,
+                        PriceName = "模拟数据-费用名称",
+                        PayMoney = 1000.00M,
+                        PayMoneyCurrency = "CNY",
+                        DayRate = 1.0000M,
+                        CNYPrice = 1.0000M,
+                        AuditGMDate = "2023-12-10 12:13:00",
+                        Payee = "模拟数据-付款方",
+                        OrbitalPrivateTransfer = 1,
+                        PayWay = "现金",
+                        IsPay = 1,
+                        Applicant = "刘华举"
+                    });
+                    groupDecreaseFeeViews.Add(new GroupDecreaseFeeView()
+                    {
+                        DPId = 0,
+                        DPDiId = 2334,
+                        PriceName = "模拟数据-费用名称",
+                        PayMoney = 1000.00M,
+                        PayMoneyCurrency = "CNY",
+                        DayRate = 1.0000M,
+                        CNYPrice = 1.0000M,
+                        AuditGMDate = "2023-12-10 12:13:00",
+                        Payee = "模拟数据-付款方",
+                        OrbitalPrivateTransfer = 1,
+                        PayWay = "现金",
+                        IsPay = 1,
+                        Applicant = "刘华举"
+                    });
+                }
+
                 decimal DecreaseCNYTotalPrice = 0.00M;
                 foreach (var item in groupDecreaseFeeViews)
                 {

OASystem/OASystem.Domain/Entities/Groups/Grp_AirTicketReservations.cs

@@ -151,11 +151,6 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int PassengerType { get; set; }
 
-        /// <summary>
-        /// 报价说明
-        /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
-        public string CreateTime1 { get; set; }
 
     }
 }

OASystem/OASystem.Domain/ViewModels/CRM/VisaDeleClientView.cs

@@ -29,9 +29,9 @@ namespace OASystem.Domain.ViewModels.CRM
         public string ClientName { get; set; }
 
         /// <summary>
-        /// 所属公司
+        /// 所属公司(全称)
         /// </summary>
-        public string CompanyName { get; set; }
+        public string CompanyFullName { get; set; }
 
         /// <summary>
         /// 性别 0 男  1 女

OASystem/OASystem.Infrastructure/Repositories/CRM/VisaDeleClientRepository.cs

@@ -42,7 +42,7 @@ namespace OASystem.Infrastructure.Repositories.CRM
             Result result = new Result() { Code = -2 };
             if (dto.PortType == 1 || dto.PortType == 2) 
             {
-                string sql = string.Format(@"Select cdc.Id,LastName+FirstName ClientName,ccc.CompanyName,Sex,Marriage,
+                string sql = string.Format(@"Select cdc.Id,LastName+FirstName ClientName,ccc.CompanyFullName,Sex,Marriage,
                                              	    Phone LandlinePhone,Tel,crmCard1.CertNo IDNo,crmCard2.CertNo PassportNo
                                              From Crm_DeleClient cdc
                                              Left Join Crm_CustomerCompany ccc On cdc.crmCompanyId = ccc.Id