Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs

@@ -717,6 +717,62 @@ namespace Myshipping.Application.Service.DataSync.Dto
         public string SourceName { get; set; }
 
 
+        #region 船舶日期相关
+
+        /// <summary>
+        /// 运港通ETD（爬取的ETD）
+        /// </summary>
+        public DateTime? YgtETD { get; set; }
+
+
+
+
+        /// <summary>
+        /// 起始港预抵日期
+        /// </summary>
+        public DateTime? StartETA { get; set; }
+
+        /// <summary>
+        /// 起始港实际抵港
+        /// </summary>
+
+        public DateTime? StartATA { get; set; }
+
+        /// <summary>
+        /// 中转预抵
+        /// </summary>
+
+        public DateTime? MiddleETA { get; set; }
+
+        /// <summary>
+        /// 中转预计离港
+        /// </summary>
+
+        public DateTime? MiddleETD { get; set; }
+
+
+        /// <summary>
+        /// 中转实际到港
+        /// </summary>
+
+        public DateTime? MiddleATA { get; set; }
+        /// <summary>
+        /// 中转实际离港
+        /// </summary>
+
+        public DateTime? MiddleATD { get; set; }
+
+
+        /// <summary>
+        /// 实际到港（目的港）
+        /// </summary>
+
+        public DateTime? ATA { get; set; }
+
+        #endregion
+
+
+
         public List<BookingCtnDto> ctnInputs { get; set; }
 
         /// <summary>
@@ -1437,6 +1493,61 @@ namespace Myshipping.Application.Service.DataSync.Dto
         /// 业务来源名称
         /// </summary>
         public string SourceName { get; set; }
+
+
+        #region 船舶日期相关
+
+        /// <summary>
+        /// 运港通ETD（爬取的ETD）
+        /// </summary>
+        public DateTime? YgtETD { get; set; }
+
+
+
+
+        /// <summary>
+        /// 起始港预抵日期
+        /// </summary>
+        public DateTime? StartETA { get; set; }
+
+        /// <summary>
+        /// 起始港实际抵港
+        /// </summary>
+
+        public DateTime? StartATA { get; set; }
+
+        /// <summary>
+        /// 中转预抵
+        /// </summary>
+
+        public DateTime? MiddleETA { get; set; }
+
+        /// <summary>
+        /// 中转预计离港
+        /// </summary>
+
+        public DateTime? MiddleETD { get; set; }
+
+
+        /// <summary>
+        /// 中转实际到港
+        /// </summary>
+
+        public DateTime? MiddleATA { get; set; }
+        /// <summary>
+        /// 中转实际离港
+        /// </summary>
+
+        public DateTime? MiddleATD { get; set; }
+
+
+        /// <summary>
+        /// 实际到港（目的港）
+        /// </summary>
+
+        public DateTime? ATA { get; set; }
+
+        #endregion
     }
 
 

Myshipping.Core/Service/User/SysUserService.cs

@@ -77,7 +77,7 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
                                                                     o.Pids.Contains(pid.Trim()))
             .WhereIF(Enum.IsDefined(typeof(CommonStatus), input.SearchStatus), (u, e, o) => u.Status == input.SearchStatus)
             .Where((u, e, o) => u.AdminType == AdminType.None)
-            .Select<UserOutput>("u.*,t.Name As TenantName ").ToDataFilter("u", "Id", FilterType.User).OrderByDescending(u=>u.Name).
+            .Select<UserOutput>("u.*,t.Name As TenantName ").ToDataFilter("u", "Id", FilterType.User).OrderByDescending(u => u.Name).
             ToPagedListAsync(input.PageNo, input.PageSize);
 
         var empInfos = await _sysEmpService.GetEmpInfo(users.Items.Select(m => long.Parse(m.Id)).ToList());
@@ -104,7 +104,7 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
         // 数据范围检查
         CheckDataScope(input.SysEmpParam == null || string.IsNullOrEmpty(input.SysEmpParam.OrgId) ? 0 : long.Parse(input.SysEmpParam.OrgId));
 
-        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account&&u.IsDeleted==false);
+        var isExist = await _sysUserRep.AsQueryable().Filter(null, true).AnyAsync(u => u.Account == input.Account && u.IsDeleted == false);
         if (isExist) throw Oops.Oh(ErrorCode.D1003);
 
         var keyDES = App.GetOptions<EncryptKeyOptions>().DES;
@@ -578,14 +578,15 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
     ///  获取租户下的用户
     /// </summary>
     /// <param name="name"></param>
-    /// <param name="TenantId">默认0 获取当前用户，可不传  传租户id获取当前租户</param>
+    /// <param name="tenantId">默认0 获取当前用户，可不传  传租户id获取当前租户</param>
     /// <returns></returns>
     [HttpGet("/sysUser/GetTenantUser")]
-    public Task<List<SysUser>> GetTenantUser(string name, long? tenantId = 0)
+    public async Task<List<SysUser>> GetTenantUser(string name, long? tenantId = 0)
     {
-        return _sysUserRep.AsQueryable().Filter(null, true).WhereIF(tenantId == 0, x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID)&&x.Status== CommonStatus.ENABLE)
+        return await _sysUserRep.AsQueryable().Filter(null, true).WhereIF(tenantId == 0, x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.Status == CommonStatus.ENABLE)
                  .WhereIF(tenantId != 0, x => x.TenantId == tenantId)
-              .WhereIF(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name)).ToListAsync();
+                 .WhereIF(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name))
+                  .OrderBy(x => x.Name).ToListAsync();
     }
 
     [HttpGet("/sysUser/DecryptPassword")]