From 2263c3dfb8c7e23253a464056e18a0c44543d84d Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Thu, 18 May 2023 11:01:55 +0800 Subject: [PATCH 1/2] 1 --- .../Service/DataSync/Dto/BookingOrderDto.cs | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs index 594570b1..7ef08687 100644 --- a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs @@ -717,6 +717,62 @@ namespace Myshipping.Application.Service.DataSync.Dto public string SourceName { get; set; } + #region 船舶日期相关 + + /// + /// 运港通ETD（爬取的ETD） + /// + public DateTime? YgtETD { get; set; } + + + + + /// + /// 起始港预抵日期 + /// + public DateTime? StartETA { get; set; } + + /// + /// 起始港实际抵港 + /// + + public DateTime? StartATA { get; set; } + + /// + /// 中转预抵 + /// + + public DateTime? MiddleETA { get; set; } + + /// + /// 中转预计离港 + /// + + public DateTime? MiddleETD { get; set; } + + + /// + /// 中转实际到港 + /// + + public DateTime? MiddleATA { get; set; } + /// + /// 中转实际离港 + /// + + public DateTime? MiddleATD { get; set; } + + + /// + /// 实际到港（目的港） + /// + + public DateTime? ATA { get; set; } + + #endregion + + + public List ctnInputs { get; set; } /// @@ -1437,6 +1493,61 @@ namespace Myshipping.Application.Service.DataSync.Dto /// 业务来源名称 /// public string SourceName { get; set; } + + + #region 船舶日期相关 + + /// + /// 运港通ETD（爬取的ETD） + /// + public DateTime? YgtETD { get; set; } + + + + + /// + /// 起始港预抵日期 + /// + public DateTime? StartETA { get; set; } + + /// + /// 起始港实际抵港 + /// + + public DateTime? StartATA { get; set; } + + /// + /// 中转预抵 + /// + + public DateTime? MiddleETA { get; set; } + + /// + /// 中转预计离港 + /// + + public DateTime? MiddleETD { get; set; } + + + /// + /// 中转实际到港 + /// + + public DateTime? MiddleATA { get; set; } + /// + /// 中转实际离港 + /// + + public DateTime? MiddleATD { get; set; } + + + /// + /// 实际到港（目的港） + /// + + public DateTime? ATA { get; set; } + + #endregion } From 52a237a71a88e7ddbf4161d9abf92808799e8afe Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Thu, 18 May 2023 11:21:26 +0800 Subject: [PATCH 2/2] 1 --- Myshipping.Core/Service/User/SysUserService.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Myshipping.Core/Service/User/SysUserService.cs b/Myshipping.Core/Service/User/SysUserService.cs index 3206cd2b..581ad687 100644 --- a/Myshipping.Core/Service/User/SysUserService.cs +++ b/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("u.*,t.Name As TenantName ").ToDataFilter("u", "Id", FilterType.User).OrderByDescending(u=>u.Name). + .Select("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().DES; @@ -578,14 +578,15 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient /// 获取租户下的用户 /// /// - /// 默认0 获取当前用户，可不传 传租户id获取当前租户 + /// 默认0 获取当前用户，可不传 传租户id获取当前租户 /// [HttpGet("/sysUser/GetTenantUser")] - public Task> GetTenantUser(string name, long? tenantId = 0) + public async Task> 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) - .WhereIF(tenantId != 0, x => x.TenantId == tenantId) - .WhereIF(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name)).ToListAsync(); + 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)) + .OrderBy(x => x.Name).ToListAsync(); } [HttpGet("/sysUser/DecryptPassword")]