团组信息

团组简略详情
web端增加团组名称

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -43,7 +43,8 @@ namespace OASystem.API.Controllers
 
         #region 团组信息 
         /// <summary>
-        ///  团组信息 团组详情
+        ///  团组信息 
+        ///  团组简略详情 
         /// </summary>
         /// <param name="dto">团组info请求dto</param>
         /// <returns></returns>

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -908,6 +908,7 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="paras">参数Json字符串</param>
         /// <returns></returns>
+        
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostSearchGrpCreditCardPayment(Search_GrpCreditCardPaymentDto _dto)
@@ -1089,8 +1090,6 @@ namespace OASystem.API.Controllers
                 /*
                  * 费用总计
                  */
-
-
                 if (entity.PaymentCurrency == 48)
                 {
                     CNY += entity.PayMoney;
@@ -1139,7 +1138,7 @@ namespace OASystem.API.Controllers
 
 
         /// <summary>
-        /// 费用审核
+        /// 费用审核 
         /// 修改团组费用审核状态
         /// </summary>
         /// <param name="_dto">参数Json字符串</param>

OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -17,10 +17,10 @@ namespace OASystem.Domain.ViewModels.Groups
     public class DelegationInfoView : Grp_DelegationInfo { }
 
     /// <summary>
-    /// 接团信息详情 共享
+    /// 接团信息详情 共享 Web
     /// 返回视图
     /// </summary>
-    public class ShareGroupInfoView
+    public class Web_ShareGroupInfoView
     {
         /// <summary>
         /// 主键Id
@@ -69,6 +69,54 @@ namespace OASystem.Domain.ViewModels.Groups
 
     }
 
+    /// <summary>
+    /// 接团信息详情 共享 Web
+    /// 返回视图
+    /// </summary>
+    public class IOSOrAndroid_ShareGroupInfoView
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 团号
+        /// </summary>
+        public string? TourCode { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string? ClientName { get; set; }
+
+        /// <summary>
+        /// 出访国家
+        /// </summary>
+        public string? VisitCountry { get; set; }
+
+        /// <summary>
+        /// 出团开始日期 
+        /// </summary>
+        public DateTime VisitStartDate { get; set; }
+
+        /// <summary>
+        /// 出团结束日期 
+        /// </summary>
+        public DateTime VisitEndDate { get; set; }
+
+        /// <summary>
+        /// 出行天数
+        /// </summary>
+        public int VisitDays { get; set; }
+
+        /// <summary>
+        /// 出行人数
+        /// </summary>
+        public int VisitPNumber { get; set; }
+
+    }
+
     /// <summary>
     /// 接团信息详情 共享
     /// 返回视图

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -51,12 +51,27 @@ namespace OASystem.Infrastructure.Repositories.Groups
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
 
-            if (dto.PortType == 1 || dto.PortType == 2) //Web Or Android
-            {
-                string sql = string.Format(@"Select Id,TeamName,TourCode,ClientName,VisitCountry,VisitStartDate,VisitEndDate,VisitDays,VisitPNumber 
+            string sql = string.Format(@"Select Id,TeamName,TourCode,ClientName,VisitCountry,VisitStartDate,VisitEndDate,VisitDays,VisitPNumber 
                                              From Grp_DelegationInfo Where Id = {0} And IsDel = 0", dto.Id);
 
-                var _DelegationInfo = await _sqlSugar.SqlQueryable<ShareGroupInfoView>(sql).FirstAsync();
+            if (dto.PortType == 1) //Web
+            {
+                var _DelegationInfo = await _sqlSugar.SqlQueryable<Web_ShareGroupInfoView>(sql).FirstAsync();
+                if (_DelegationInfo != null)
+                {
+                    if (_DelegationInfo.VisitCountry.Contains("|"))
+                    {
+                        _DelegationInfo.VisitCountry = _DelegationInfo.VisitCountry.Replace("|", "、");
+                    }
+
+                    
+                    result.Data = _DelegationInfo;
+                }
+                else result.Msg = "暂无该团组信息";
+            }
+            else if (dto.PortType == 2 || dto.PortType == 3) //IOS Or Android
+            {
+                var _DelegationInfo = await _sqlSugar.SqlQueryable<IOSOrAndroid_ShareGroupInfoView>(sql).FirstAsync();
                 if (_DelegationInfo != null)
                 {
                     if (_DelegationInfo.VisitCountry.Contains("|"))
@@ -64,15 +79,17 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         _DelegationInfo.VisitCountry = _DelegationInfo.VisitCountry.Replace("|", "、");
                     }
 
-                    result.Code = 0;
-                    result.Msg = "成功!";
                     result.Data = _DelegationInfo;
                 }
                 else result.Msg = "暂无该团组信息";
+
             }
+            else result.Msg = "请输入正确的端口号。1 Web 2 Android 3 IOS";
 
-            return result;
+            result.Code = 0;
+            result.Msg = "成功!";
 
+            return result;
         }
 
         #endregion