From 238e6632488302bf8b98eeaa7de4aea803a5d8e2 Mon Sep 17 00:00:00 2001 From: wanghaomei Date: Thu, 30 Nov 2023 15:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E8=88=B9=E6=9C=9F=E8=A1=A8=E6=88=AA=E5=8D=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingOrder/BookingOrderService.cs | 4 +--- .../BookingVesselInfoService.cs | 3 ++- Myshipping.Core/Entity/DJY/DjyVesselInfo.cs | 18 ++++++++++++++---- Myshipping.Core/Entity/SysUser.cs | 2 +- Myshipping.Core/Myshipping.Core.xml | 18 ++++++++++++++---- Myshipping.Core/Service/User/Dto/UserInput.cs | 2 +- Myshipping.Core/Service/User/Dto/UserOutput.cs | 2 +- Myshipping.Core/Service/User/SysUserService.cs | 4 ++-- 8 files changed, 36 insertions(+), 17 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 1f0d2e63..f2a633cc 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -1145,9 +1145,7 @@ namespace Myshipping.Application it.MiddleETD, it.MiddleATA, it.MiddleATD, - it.ATA, - it.TRUCKERID, - it.TRUCKER + it.ATA }).ExecuteCommandAsync(); if (!string.IsNullOrEmpty(reqId)) diff --git a/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs b/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs index 30bc37b5..dee837ae 100644 --- a/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs +++ b/Myshipping.Application/Service/BookingVesselInfo/BookingVesselInfoService.cs @@ -140,7 +140,8 @@ namespace Myshipping.Application x.ATD, x.CARRIER, x.CARRIERID, - x.VoynoInside + x.VoynoInside, + x.CloseDocTime }) .ExecuteCommandAsync(); } diff --git a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs index 42a6aeb1..b93879c0 100644 --- a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs +++ b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs @@ -9,9 +9,9 @@ namespace Myshipping.Application.Entity /// [SugarTable("djy_vesselinfo")] [Description("船期信息")] - public class DjyVesselInfo : DBEntityTenant + public class DjyVesselInfo : DBEntityTenant { - + /// /// 船名 /// @@ -99,18 +99,24 @@ namespace Myshipping.Application.Entity /// public bool Sign { get; set; } + /// + /// 截单时间 + /// + public DateTime? CloseDocTime { get; set; } + } - public class DjyVesselInfoDto { + public class DjyVesselInfoDto + { /// /// 东胜id /// public string BSNO { get; set; } - public virtual long Id { get; set; } + public virtual long Id { get; set; } /// /// 船名 /// @@ -191,5 +197,9 @@ namespace Myshipping.Application.Entity /// 运港通ETD /// public DateTime? YgtETD { get; set; } + /// + /// 截单时间 + /// + public DateTime? CloseDocTime { get; set; } } } \ No newline at end of file diff --git a/Myshipping.Core/Entity/SysUser.cs b/Myshipping.Core/Entity/SysUser.cs index 42e4ae13..af5eaae0 100644 --- a/Myshipping.Core/Entity/SysUser.cs +++ b/Myshipping.Core/Entity/SysUser.cs @@ -103,7 +103,7 @@ public class SysUser : DBEntityTenant /// /// 用户代码 /// - public string Code { get; set; } + public string UserCode { get; set; } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index 29fc5aa5..2bb1bba9 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -4115,7 +4115,7 @@ 大简云userid - + 用户代码 @@ -15788,7 +15788,7 @@ 租户id - + 用户代码 @@ -15933,7 +15933,7 @@ 所属租户 - + 用户代码 @@ -16224,7 +16224,7 @@ 获取租户下的用户 - + 用户的代码、英文名或中文名 默认0 获取当前用户，可不传 传租户id获取当前租户 @@ -18591,6 +18591,11 @@ 是否调用接口标志 + + + 截单时间 + + 东胜id @@ -18691,5 +18696,10 @@ 运港通ETD + + + 截单时间 + + diff --git a/Myshipping.Core/Service/User/Dto/UserInput.cs b/Myshipping.Core/Service/User/Dto/UserInput.cs index 9c7be9e5..f7c4fc1e 100644 --- a/Myshipping.Core/Service/User/Dto/UserInput.cs +++ b/Myshipping.Core/Service/User/Dto/UserInput.cs @@ -85,7 +85,7 @@ public class UserInput : InputBase /// /// 用户代码 /// - public string Code { get; set; } + public string UserCode { get; set; } } public class AddUserInput : UserInput diff --git a/Myshipping.Core/Service/User/Dto/UserOutput.cs b/Myshipping.Core/Service/User/Dto/UserOutput.cs index 5e2a7592..641b0354 100644 --- a/Myshipping.Core/Service/User/Dto/UserOutput.cs +++ b/Myshipping.Core/Service/User/Dto/UserOutput.cs @@ -78,5 +78,5 @@ public class UserOutput /// /// 用户代码 /// - public string Code { get; set; } + public string UserCode { get; set; } } diff --git a/Myshipping.Core/Service/User/SysUserService.cs b/Myshipping.Core/Service/User/SysUserService.cs index c615960b..e6e9bdef 100644 --- a/Myshipping.Core/Service/User/SysUserService.cs +++ b/Myshipping.Core/Service/User/SysUserService.cs @@ -575,14 +575,14 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient /// /// 获取租户下的用户 /// - /// + /// 用户的代码、英文名或中文名 /// 默认0 获取当前用户，可不传 传租户id获取当前租户 /// [HttpGet("/sysUser/GetTenantUser")] public async Task> GetTenantUser(string name, long? tenantId = 0) { return await _sysUserRep.AsQueryable().Filter(null, true) - .WhereIF(!string.IsNullOrWhiteSpace(name), x => x.Name.Contains(name)) + .WhereIF(!string.IsNullOrWhiteSpace(name), x => x.UserCode.Contains(name) || x.EnName.Contains(name) || x.Name.Contains(name)) .WhereIF(tenantId == 0, x => x.TenantId == Convert.ToInt64(UserManager.TENANT_ID) && x.Status == CommonStatus.ENABLE && x.IsDeleted == false) .WhereIF(tenantId != 0, x => x.TenantId == tenantId) .OrderBy(x => x.Name).ToListAsync();