Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Domain/Dtos/Groups/CarTouristGuideGroundDto.cs

@@ -96,6 +96,12 @@ namespace OASystem.Domain.Dtos.Groups
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 此笔费用类型
+        /// </summary>
+        public int PriceType { get; set; }
+
     }
 
     public class CarTouristGuideGroundContentDto : PortDtoBase

OASystem/OASystem.Domain/Entities/Groups/Grp_CarTouristGuideGroundReservations.cs

@@ -103,5 +103,10 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDescription = "选中的复选框", ColumnDataType = "nvarchar(1000)")]
         public string SelectCheck { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public int PriceType {  get; set; }
     }
 }

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CarTouristGuideGroundView.cs

@@ -123,5 +123,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 支付方式str
         /// </summary>
         public string PayStrd { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string priceTypeStr { get; set; }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -84,6 +84,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         QuotedPriceExplanation = grp_CarTouristGuide.QuotedPriceExplanation,
                         OrbitalPrivateTransfer = grp_CarTouristGuide.OrbitalPrivateTransfer,
                         Remark = grp_CarTouristGuide.Remark,
+                        PriceType = grp_CarTouristGuide.PriceType,
                     });
                     if (res)
                     {
@@ -124,7 +125,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             catch (Exception ex)
             {
-                result = new Result() { Code = -2, Msg = "未知错误" };
+                result = new Result() { Code = -2, Msg = "未知错误" + ex.Message };
             }
             return result;
         }
@@ -381,7 +382,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         start,
                         end,
                         ssdv,
-                        checkedItem
+                        checkedItem,
+                        existItem = _TableInitialization.Select(x => x.Name).ToList(),
                     };
 
                     return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
@@ -505,7 +507,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 if (dto.PortType == 1)
                 {
-                    string sql = string.Format(@"select t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayMoney,c.PayDid from 
+                    string sql = string.Format(@"select t.*,(select Name from Sys_SetData where isdel = 0 and id = t.priceType) as 'priceTypeStr',s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayMoney,c.PayDid from 
                                                 Grp_CarTouristGuideGroundReservations t
                                                 left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id  and c.isdel=0
                                                 left Join Sys_SetData s on s.Id=c.PaymentCurrency {0}
@@ -526,7 +528,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 }
                             }
                         }
-                        
+
+                        if (string.IsNullOrWhiteSpace(item.priceTypeStr))
+                        {
+                            item.priceTypeStr = "未选择！";
+                        }
+
                         if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
                         else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
                         
@@ -550,7 +557,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 else if (dto.PortType == 2 || dto.PortType == 3)
                 {
                     string sql = string.Format(@"Select * From (	
-                                            Select row_number() over (order by c.IsAuditGM,c.PayPercentage desc) as RowNumber,t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayDid,c.PayMoney
+                                            Select row_number() over (order by c.IsAuditGM,c.PayPercentage desc) as RowNumber,t.*,(select Name from Sys_SetData where isdel = 0 and id = t.priceType) as 'priceTypeStr',s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayDid,c.PayMoney
                                             from 
                                             Grp_CarTouristGuideGroundReservations t
                                             left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id  and c.isdel=0
@@ -571,6 +578,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             }
                         }
 
+                        if (string.IsNullOrWhiteSpace(item.priceTypeStr))
+                        {
+                            item.priceTypeStr = "未选择！";
+                        }
+
                         if (item.OrbitalPrivateTransfer == 0) item.OrbitalPrivateTransferStr = "公转";
                         else if (item.OrbitalPrivateTransfer == 1) item.OrbitalPrivateTransferStr = "私转";
                         item.ServiceStartTime = Convert.ToDateTime(item.ServiceStartTime).ToString("yyyy-MM-dd");