+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -323,7 +323,6 @@ namespace OASystem.API.Controllers
             #region 页面操作权限验证
             pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);
 
-
             if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限"));
             #endregion
 

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -3709,7 +3709,7 @@ WHERE
   AND CHARINDEX('地接',hr.HotelName) = 0
   AND CHARINDEX('损失',hr.HotelName) = 0
   AND CHARINDEX('补差',hr.HotelName) = 0
-  AND hr.CheckInDate BETWEEN '{0}' AND '{1}'
+  AND hr.CheckInDate BETWEEN CONVERT(datetime,'{0}') AND CONVERT(datetime,'{1}')
 ORDER BY
   hr.CheckInDate
 ", beginDt,endDt);

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -34,6 +34,16 @@ namespace OASystem.Domain.ViewModels.System
         public string Name { get; set; }
 
         public string Remark { get; set; }
+
+        public int RemarkSort
+        {
+            get
+            {
+                int sort = 0;
+                int.TryParse(Remark, out sort);
+                return sort;
+            }
+        }
     }
 
     /// <summary>

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

@@ -186,6 +186,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 List<Sys_SetData> TableInitialization = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 17 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _TableInitialization = _mapper.Map<List<SetDataInfoView>>(TableInitialization);
 
+                _TableInitialization = _TableInitialization.OrderBy(x => x.RemarkSort).ToList();
+
                 List<Sys_SetData> ssd = _sqlSugar.Queryable<Sys_SetData>().Where(x => x.STid == 78).ToList();
                 List<SetDataInfoView> ssdv = _mapper.Map<List<Sys_SetData>, List<SetDataInfoView>>(ssd);