酒店预定

微调

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -183,12 +183,17 @@ namespace OASystem.API.Controllers
 									         From Grp_GroupsTaskAssignment gta
 									         Inner Join Grp_DelegationInfo di On gta.DIId = di.Id
 									         Where gta.IsDel = 0 And di.IsDel = 0 And gta.IsEnable = 1
-									         And gta.CTId = {0} And gta.UId = {1}", dto.CTable,dto.UserId);
+									         And gta.CTId = {0} And gta.UId = {1}", dto.CTable, dto.UserId);
 
                 RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
                 var data = await _groupRep._sqlSugar.SqlQueryable<GroupListByCTableAndUserIdView>(sql).ToPageListAsync(dto.PageIndex, dto.PageSize, total); //ToPageAsync
+                foreach (var item in data)
+                {
+                    item.VisitStartDate = item.VisitStartDate == "" ? "" : Convert.ToDateTime(item.VisitStartDate).ToString("yyyy-MM-dd");
+                    item.VisitEndDate = item.VisitEndDate == "" ? "" : Convert.ToDateTime(item.VisitEndDate).ToString("yyyy-MM-dd");
+                }
 
-                return Ok(JsonView(true, "操作成功!",data,total));
+                return Ok(JsonView(true, "操作成功!", data, total));
             }
             else
             {

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

@@ -1,6 +1,10 @@
-using Newtonsoft.Json;
+using Google.Protobuf;
+using Google.Protobuf.WellKnownTypes;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.ViewModels.QiYeWeChat;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -97,15 +101,17 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string? VisitCountry { get; set; }
 
+
         /// <summary>
         /// 出访开始日期
         /// </summary>
-        public DateTime VisitStartDate { get; set; }
+        public string? VisitStartDate { get; set; }
 
         /// <summary>
         /// 出访结束日期
         /// </summary>
-        public DateTime VisitEndDate { get; set; }
+        public string? VisitEndDate { get; set; }
+        
 
         /// <summary>
         /// 出访天数
@@ -116,8 +122,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 出访人数
         /// </summary>
         public int VisitPNumber { get; set; }
+
     }
 
+
+
     /// <summary>
     /// 接团信息详情 共享 Web
     /// 返回视图