用户代码

船期表截单时间

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))

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();
             }

Myshipping.Core/Entity/DJY/DjyVesselInfo.cs

@@ -9,9 +9,9 @@ namespace Myshipping.Application.Entity
     /// </summary>
     [SugarTable("djy_vesselinfo")]
     [Description("船期信息")]
-    public class DjyVesselInfo :  DBEntityTenant
+    public class DjyVesselInfo : DBEntityTenant
     {
-        
+
         /// <summary>
         /// 船名
         /// </summary>
@@ -99,18 +99,24 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public bool Sign { get; set; }
 
+        /// <summary>
+        /// 截单时间
+        /// </summary>
+        public DateTime? CloseDocTime { get; set; }
+
     }
 
 
 
 
-    public class DjyVesselInfoDto {
+    public class DjyVesselInfoDto
+    {
 
         /// <summary>
         /// 东胜id
         /// </summary>
         public string BSNO { get; set; }
-         public virtual long Id { get; set; }
+        public virtual long Id { get; set; }
         /// <summary>
         /// 船名
         /// </summary>
@@ -191,5 +197,9 @@ namespace Myshipping.Application.Entity
         /// 运港通ETD
         /// </summary>
         public DateTime? YgtETD { get; set; }
+        /// <summary>
+        /// 截单时间
+        /// </summary>
+        public DateTime? CloseDocTime { get; set; }
     }
 }

Myshipping.Core/Entity/SysUser.cs

@@ -103,7 +103,7 @@ public class SysUser : DBEntityTenant
     /// <summary>
     /// 用户代码
     /// </summary>
-    public string Code { get; set; }
+    public string UserCode { get; set; }
 }
 
 

Myshipping.Core/Myshipping.Core.xml

@@ -4115,7 +4115,7 @@
             大简云userid
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Entity.SysUser.Code">
+        <member name="P:Myshipping.Core.Entity.SysUser.UserCode">
             <summary>
             用户代码
             </summary>
@@ -15788,7 +15788,7 @@
             租户id
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Service.UserInput.Code">
+        <member name="P:Myshipping.Core.Service.UserInput.UserCode">
             <summary>
             用户代码
             </summary>
@@ -15933,7 +15933,7 @@
             所属租户
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Service.UserOutput.Code">
+        <member name="P:Myshipping.Core.Service.UserOutput.UserCode">
             <summary>
             用户代码
             </summary>
@@ -16224,7 +16224,7 @@
             <summary>
              获取租户下的用户
             </summary>
-            <param name="name"></param>
+            <param name="name">用户的代码、英文名或中文名</param>
             <param name="tenantId">默认0 获取当前用户，可不传  传租户id获取当前租户</param>
             <returns></returns>
         </member>
@@ -18591,6 +18591,11 @@
             是否调用接口标志
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfo.CloseDocTime">
+            <summary>
+            截单时间
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Entity.DjyVesselInfoDto.BSNO">
             <summary>
             东胜id
@@ -18691,5 +18696,10 @@
             运港通ETD
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfoDto.CloseDocTime">
+            <summary>
+            截单时间
+            </summary>
+        </member>
     </members>
 </doc>

Myshipping.Core/Service/User/Dto/UserInput.cs

@@ -85,7 +85,7 @@ public class UserInput : InputBase
     /// <summary>
     /// 用户代码
     /// </summary>
-    public string Code { get; set; }
+    public string UserCode { get; set; }
 }
 
 public class AddUserInput : UserInput

Myshipping.Core/Service/User/Dto/UserOutput.cs

@@ -78,5 +78,5 @@ public class UserOutput
     /// <summary>
     /// 用户代码
     /// </summary>
-    public string Code { get; set; }
+    public string UserCode { get; set; }
 }

Myshipping.Core/Service/User/SysUserService.cs

@@ -575,14 +575,14 @@ public class SysUserService : ISysUserService, IDynamicApiController, ITransient
     /// <summary>
     ///  获取租户下的用户
     /// </summary>
-    /// <param name="name"></param>
+    /// <param name="name">用户的代码、英文名或中文名</param>
     /// <param name="tenantId">默认0 获取当前用户，可不传  传租户id获取当前租户</param>
     /// <returns></returns>
     [HttpGet("/sysUser/GetTenantUser")]
     public async Task<List<SysUser>> 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();