修改返回参数

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

@@ -7,8 +7,70 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.Groups
 {
-    public class Grp_CarTouristGuideGroundView:Grp_CarTouristGuideGroundReservations
+    public class Grp_CarTouristGuideGroundView
     {
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 地接地区
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        /// 服务公司
+        /// </summary>
+        public string ServiceCompany { get; set; }
+
+        /// <summary>
+        /// 服务导游
+        /// </summary>
+        public string ServiceGuide { get; set; }
+
+        /// <summary>
+        /// 导游地接联系电话
+        /// </summary>
+        public string ServiceTel { get; set; }
+
+        /// <summary>
+        /// Bus名称
+        /// </summary>
+        public string BusName { get; set; }
+
+        /// <summary>
+        /// Bus描述
+        /// </summary>
+        public string BusDescription { get; set; }
+
+        /// <summary>
+        /// 车公司联系电话
+        /// </summary>
+        /// 
+        public string BusTel { get; set; }
+
+        /// <summary>
+        /// 服务时间起
+        /// </summary>
+        public string ServiceStartTime { get; set; }
+        /// <summary>
+        /// 服务时间止
+        /// </summary>
+        public string ServiceEndTime { get; set; }
+        /// <summary>
+        /// 服务报价
+        /// </summary>
+        public decimal ServiceQuotedPrice { get; set; }
+        /// <summary>
+        /// 币种（设置数据外键编号）
+        /// </summary>
+        public int CId { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
         /// <summary>
         /// 行号
         /// </summary>
@@ -32,6 +94,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int IsAuditGM { get; set; }
         /// <summary>
+        /// 总经理是否审核
+        /// </summary>
+        public string IsAuditGMStr { get; set; }
+        /// <summary>
         /// 币种
         /// </summary>
         public string CurrencyStr { get; set; }

OASystem/OASystem.Domain/ViewModels/Groups/VisaInfoView.cs

@@ -7,20 +7,40 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.Groups
 {
-    public class VisaInfoView:Grp_VisaInfo
+    public class VisaInfoView
     {
         /// <summary>
         /// 行号
         /// </summary>
         public int RowNumber { get; set; }
         /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DIId { get; set; }
+        /// <summary>
+        /// 签证客户
+        /// </summary>
+        public string VisaClient { get; set; }
+        /// <summary>
+        /// 签证费用
+        /// </summary>
+        public decimal VisaPrice { get; set; }
+        /// <summary>
         /// 总经理是否审核
         /// </summary>
         public int IsAuditGM { get; set; }
         /// <summary>
+        /// 总经理是否审核
+        /// </summary>
+        public string IsAuditGMStr { get; set; }
+        /// <summary>
         /// 币种
         /// </summary>
         public string VisaCurrencyStr { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
 }

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

@@ -252,14 +252,20 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     List<Grp_CarTouristGuideGroundView> infoViews = _sqlSugar.SqlQueryable<Grp_CarTouristGuideGroundView>(sql).ToList();
                     foreach (var item in infoViews)
                     {
+                        item.ServiceStartTime = Convert.ToDateTime(item.ServiceStartTime).ToString("yyyy-MM-dd");
+                        item.ServiceEndTime = Convert.ToDateTime(item.ServiceEndTime).ToString("yyyy-MM-dd");
                         item.ServiceQuotedPrice = item.PayMoney;
                         item.PayThenMoney = Math.Round(item.PayPercentage/100 * item.ServiceQuotedPrice, 2);
                         item.RemainingBalance = Math.Round(item.ServiceQuotedPrice- item.PayPercentage / 100 * item.ServiceQuotedPrice);
+                        if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
+                        else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
+                        else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
+                        else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
                         Sys_SetData s = _sqlSugar.Queryable<Sys_SetData>().First(a=>a.IsDel==0 && a.Id==item.PayDid);
                         if (s!=null)
                         {
                             item.PayStrd = s.Name;
-                        }
+                        }else item.PayStrd ="未选择";
                     }
                     return result = new Result() { Code = 0, Msg = "查询成功！", Data = infoViews };
                 }
@@ -276,6 +282,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     List<Grp_CarTouristGuideGroundView> grp_CarTourists = _sqlSugar.SqlQueryable<Grp_CarTouristGuideGroundView>(sql).ToList();
                     foreach (var item in grp_CarTourists)
                     {
+                        item.ServiceStartTime = Convert.ToDateTime(item.ServiceStartTime).ToString("yyyy-MM-dd");
+                        item.ServiceEndTime = Convert.ToDateTime(item.ServiceEndTime).ToString("yyyy-MM-dd");
+                        if (item.IsAuditGM == 0) item.IsAuditGMStr = "未审核";
+                        else if (item.IsAuditGM == 1) item.IsAuditGMStr = "已通过";
+                        else if (item.IsAuditGM == 2) item.IsAuditGMStr = "未通过";
+                        else if (item.IsAuditGM == 3) item.IsAuditGMStr = "自动审核";
                         item.ServiceQuotedPrice = item.PayMoney;
                         item.PayThenMoney = Math.Round(item.PayPercentage / 100 * item.ServiceQuotedPrice, 2);
                         item.RemainingBalance = Math.Round(item.ServiceQuotedPrice - item.PayPercentage / 100 * item.ServiceQuotedPrice);
@@ -284,6 +296,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         {
                             item.PayStrd = s.Name;
                         }
+                        else item.PayStrd = "未选择";
                     }
                     string CountSql = string.Format(@"Select COUNT(1) as Count From (	
                                                         select t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage from 

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -83,6 +83,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                 (select Name from Sys_SetData where isdel=0 and v.VisaCurrency=Id) VisaCurrencyStr from
                                                 Grp_VisaInfo v {0} order by CreateTime desc",sqlWhere);
                     List<VisaInfoView> infoViews = _sqlSugar.SqlQueryable<VisaInfoView>(sql).ToList();
+                    foreach (VisaInfoView view in infoViews)
+                    {
+                        if (view.IsAuditGM == 0) view.IsAuditGMStr = "未审核";
+                        else if (view.IsAuditGM == 1) view.IsAuditGMStr = "已通过";
+                        else if (view.IsAuditGM == 2) view.IsAuditGMStr = "未通过";
+                        else if (view.IsAuditGM == 3) view.IsAuditGMStr = "自动审核";
+                    }
                     return result = new Result() { Code = 0, Msg = "查询成功！", Data = infoViews };
                 }
                 else if(dto.PortType==2 || dto.PortType==3)
@@ -95,7 +102,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                             ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
 
                     List<VisaInfoView> infoViews = _sqlSugar.SqlQueryable<VisaInfoView>(sql).ToList();
-
+                    foreach (VisaInfoView view in infoViews)
+                    {
+                        if (view.IsAuditGM == 0) view.IsAuditGMStr = "未审核";
+                        else if (view.IsAuditGM == 1) view.IsAuditGMStr = "已通过";
+                        else if (view.IsAuditGM == 2) view.IsAuditGMStr = "未通过";
+                        else if (view.IsAuditGM == 3) view.IsAuditGMStr = "自动审核";
+                    }
                     string CountSql = string.Format(@"Select COUNT(1) as Count From (	
                                             Select v.*,c.IsAuditGM,s.Name as VisaCurrencyStr
                                             From Grp_VisaInfo v