通用接口 团组预览详情

增加 团组名称

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -41,7 +41,7 @@ namespace OASystem.API.Controllers
             _teamRateRep = teamRateRep;
         }
 
-        #region 团组信息 团组详情
+        #region 团组信息 
         /// <summary>
         ///  团组信息 团组详情
         /// </summary>
@@ -94,8 +94,56 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, "获取失败!"));
             }
 
-            List<SetDataInfoView> _view = JsonConvert.DeserializeObject<List<SetDataInfoView>>(JsonConvert.SerializeObject(result.Data));
-            _view.Insert(0, new SetDataInfoView { Id = -1, Name = "所有模块" });
+            List<SetDataInfoView> _view1 = JsonConvert.DeserializeObject<List<SetDataInfoView>>(JsonConvert.SerializeObject(result.Data));
+
+            SetDataInfoView xc_view = new SetDataInfoView();//77	行程 //移除行程
+            xc_view = _view1.Where(it => it.Id == 77).FirstOrDefault();
+            if (xc_view != null) {  _view1.Remove(xc_view); };
+
+
+            List<SetDataInfoView> _view = new List<SetDataInfoView>();
+            //_view.Insert(0, new SetDataInfoView { Id = -1, Name = "所有模块" });
+
+            SetDataInfoView qz_view = new SetDataInfoView();//80	签证
+            qz_view = _view1.Where(it => it.Id == 80).FirstOrDefault();
+            if (qz_view != null) { _view.Insert(0, qz_view); _view1.Remove(qz_view); };
+
+            SetDataInfoView jpyd_view = new SetDataInfoView();//85	机票预订
+            jpyd_view = _view1.Where(it => it.Id == 85).FirstOrDefault();
+            if (jpyd_view != null) { _view.Insert(1, jpyd_view); _view1.Remove(jpyd_view); };
+
+            SetDataInfoView jdyd_view = new SetDataInfoView();//76	酒店预订
+            jdyd_view = _view1.Where(it => it.Id == 76).FirstOrDefault();
+            if (jdyd_view != null) { _view.Insert(2, jdyd_view); _view1.Remove(jdyd_view); };
+
+            SetDataInfoView jdzc_view = new SetDataInfoView();//751	酒店早餐
+            jdzc_view = _view1.Where(it => it.Id == 751).FirstOrDefault();
+            if (jdzc_view != null) { _view.Insert(3, jdzc_view); _view1.Remove(jdzc_view); };
+
+            SetDataInfoView cdy_view = new SetDataInfoView();//79	车/导游地接
+            cdy_view = _view1.Where(it => it.Id == 79).FirstOrDefault();
+            if (cdy_view != null) { _view.Insert(4, cdy_view); _view1.Remove(cdy_view); };
+
+            SetDataInfoView yqgw_view = new SetDataInfoView();//81	邀请/公务活动
+            yqgw_view = _view1.Where(it => it.Id == 81).FirstOrDefault();
+            if (yqgw_view != null) { _view.Insert(5, yqgw_view); _view1.Remove(yqgw_view); };
+
+            SetDataInfoView bx_view = new SetDataInfoView();//82	团组客户保险
+            bx_view = _view1.Where(it => it.Id == 82).FirstOrDefault();
+            if (bx_view != null) { _view.Insert(6, bx_view); _view1.Remove(bx_view); };
+
+            SetDataInfoView qtkx_view = new SetDataInfoView();//98	其他款项
+            qtkx_view = _view1.Where(it => it.Id == 98).FirstOrDefault();
+            if (qtkx_view != null) { _view.Insert(7, qtkx_view); _view1.Remove(qtkx_view); };
+
+            SetDataInfoView skth_view = new SetDataInfoView();//285	收款退还与其他款项
+            skth_view = _view1.Where(it => it.Id == 285).FirstOrDefault();
+            if (skth_view != null) { _view.Insert(8, skth_view); _view1.Remove(skth_view); };
+
+            if (_view1.Count > 0)
+            {
+                _view.AddRange(_view1);
+            }
 
             return Ok(JsonView(_view));
         }

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -929,26 +929,6 @@ namespace OASystem.API.Controllers
 
             Grp_CreditCardPaymentView _view = new Grp_CreditCardPaymentView();
 
-            #region 团组基本信息
-
-            Grp_DelegationInfo _delegation = _groupRepository.Query<Grp_DelegationInfo>(s => s.Id == _dto.DiId).First();
-            if (_delegation != null)
-            {
-                _view.ClientName = _delegation.ClientName;
-                _view.DiId = _dto.DiId;
-                _view.TeamName = _delegation.TeamName;
-                _view.VisitCountry = _delegation.VisitCountry;
-                _view.VisitDate = _delegation.VisitStartDate.ToString("yyyy-MM-dd") + " ~ " + _delegation.VisitEndDate.ToString("yyyy-MM-dd");
-                _view.VisitDays = _delegation.VisitDays;
-                _view.VisitPNumber = _delegation.VisitPNumber;
-            }
-            else
-            {
-                return Ok(JsonView(false, "团组信息为空"));
-            }
-
-            #endregion
-
             #region 费用清单
             var exp = Expressionable.Create<Grp_CreditCardPayment>();
             exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);

OASystem/OASystem.Domain/Dtos/Groups/GrpCreditCardPaymentDto.cs

@@ -37,7 +37,7 @@ namespace OASystem.Domain.Dtos.Groups
         public int DiId { get; set; }
 
         /// <summary>
-        /// 费用类型 -1 -所有, 76-酒店预订,79-车导地接,80-签证,81-邀请公务,85-机票预订,98-团组增减款项
+        /// 费用类型  
         /// </summary>
         public int Label { get; set; } = 0;
 

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

@@ -27,6 +27,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int Id { get; set; }
 
+        /// <summary>
+        /// 团名
+        /// </summary>
+        public string? TeamName { get; set; }
+
         /// <summary>
         /// 团号
         /// </summary>

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

@@ -43,7 +43,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         #region 团组信息 团组详情共享Api
 
         /// <summary>
-        /// 团组信息 团组详情共享Api
+        /// 团组信息 团组预览详情共享Api
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -53,7 +53,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (dto.PortType == 1 || dto.PortType == 2) //Web Or Android
             {
-                string sql = string.Format(@"Select Id,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();