whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

用户自定义配置修改

Browse Source
booking_auth_dev
wanghaomei 2 years ago
parent 3f283ba9b6
commit 07ed013cc7
8 changed files with 10 additions and 92 deletions
Show Stats Download Patch File Download Diff File

2
Myshipping.Core/Entity/DJY/DjyUserConfig.cs
Unescape Escape View File

@ -16,7 +16,7 @@ namespace Myshipping.Core.Entity
/// <summary>
/// 类型（列表显示列、查询条件自定义等）
/// </summary>
public DjyUserConfigType Type { get; set; }
public string Type { get; set; }
/// <summary>
/// 配置数据json
/// </summary>

25
Myshipping.Core/Enum/DjyUserConfig.cs
Unescape Escape View File

@ -1,25 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Myshipping.Core
{
public enum DjyUserConfigType
{
/// <summary>
/// 订舱台账列
/// </summary>
[Description("订舱台账列")]
BOOKING_COLUMN = 10,
/// <summary>
/// 订舱台账列
/// </summary>
[Description("订舱台账查询条件")]
BOOKING_QUERYC_CONDITION = 20,
}
}

36
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -3055,16 +3055,6 @@
自定义数据
</summary>
</member>
<member name="F:Myshipping.Core.DjyUserConfigType.BOOKING_COLUMN">
<summary>
订舱台账列
</summary>
</member>
<member name="F:Myshipping.Core.DjyUserConfigType.BOOKING_QUERYC_CONDITION">
<summary>
订舱台账列
</summary>
</member>
<member name="T:Myshipping.Core.DocumentType">
<summary>
文档类型
@ -7054,33 +7044,13 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.DjyUserConfigService.Get(Myshipping.Core.DjyUserConfigType)">
<member name="M:Myshipping.Core.Service.DjyUserConfigService.Get(System.String)">
<summary>
获取用户自定义配置
</summary>
<param name="type"></param>
<returns></returns>
</member>
<member name="T:Myshipping.Core.Service.DjyUserConfigDto">
<summary>
订舱自定义配置输出参数
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyUserConfigDto.Id">
<summary>
主键
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyUserConfigDto.Type">
<summary>
类型（列表显示列、查询条件自定义等）
</summary>
</member>
<member name="P:Myshipping.Core.Service.DjyUserConfigDto.ConfigJson">
<summary>
配置数据json
</summary>
</member>
<member name="T:Myshipping.Core.Service.DjyUserConfigInput">
<summary>
自定义配置输入参数
@ -10563,14 +10533,14 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysUserService.GetUserOwnRole(System.Int64)">
<member name="M:Myshipping.Core.Service.SysUserService.GetUserOwnRole(Myshipping.Core.Service.QueryUserInput)">
<summary>
获取用户拥有角色
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysUserService.GetUserOwnData(System.Int64)">
<member name="M:Myshipping.Core.Service.SysUserService.GetUserOwnData(Myshipping.Core.Service.QueryUserInput)">
<summary>
获取用户拥有数据
</summary>

4
Myshipping.Core/Service/DjyUserConfig/DjyUserConfigService.cs
Unescape Escape View File

@ -32,7 +32,7 @@ namespace Myshipping.Core.Service
public async Task<dynamic> Page([FromQuery] QueryDjyUserConfigInput input)
{
var entities = await _rep.AsQueryable()
.WhereIF(input.Type.HasValue, u => u.Type == input.Type)
.WhereIF(!string.IsNullOrWhiteSpace(input.Type), u => u.Type == input.Type)
.WhereIF(!string.IsNullOrWhiteSpace(input.ConfigJson), u => u.ConfigJson == input.ConfigJson)
.ToPagedListAsync(input.PageNo, input.PageSize);
return entities.XnPagedResult();
@ -89,7 +89,7 @@ namespace Myshipping.Core.Service
/// <param name="type"></param>
/// <returns></returns>
[HttpGet("/DjyUserConfig/get")]
public async Task<DjyUserConfig> Get([FromQuery] DjyUserConfigType type)
public async Task<DjyUserConfig> Get([FromQuery] string type)
{
return await _rep.FirstOrDefaultAsync(u => u.CreatedUserId == UserManager.UserId && u.Type == type);
}

27
Myshipping.Core/Service/DjyUserConfig/Dto/DjyUserConfigDto.cs
Unescape Escape View File

@ -1,27 +0,0 @@
using System;
using Myshipping.Core;
namespace Myshipping.Core.Service
{
/// <summary>
/// 订舱自定义配置输出参数
/// </summary>
public class DjyUserConfigDto
{
/// <summary>
/// 主键
/// </summary>
public long? Id { get; set; }
/// <summary>
/// 类型（列表显示列、查询条件自定义等）
/// </summary>
public DjyUserConfigType Type { get; set; }
/// <summary>
/// 配置数据json
/// </summary>
public string ConfigJson { get; set; }
}
}

4
Myshipping.Core/Service/DjyUserConfig/Dto/DjyUserConfigInput.cs
Unescape Escape View File

@ -12,7 +12,7 @@ namespace Myshipping.Core.Service
/// <summary>
/// 类型（列表显示列、查询条件自定义等）
/// </summary>
public virtual DjyUserConfigType Type { get; set; }
public virtual string Type { get; set; }
/// <summary>
/// 配置数据json
@ -67,7 +67,7 @@ namespace Myshipping.Core.Service
/// <summary>
/// 类型（列表显示列、查询条件自定义等）
/// </summary>
public virtual DjyUserConfigType? Type { get; set; }
public virtual string Type { get; set; }
/// <summary>
/// 配置数据json

2
Myshipping.Core/Service/DjyUserConfig/Dto/DjyUserConfigOutput.cs
Unescape Escape View File

@ -15,7 +15,7 @@ namespace Myshipping.Core.Service
/// <summary>
/// 类型（列表显示列、查询条件自定义等）
/// </summary>
public DjyUserConfigType Type { get; set; }
public string Type { get; set; }
/// <summary>
/// 配置数据json

2
Myshipping.Core/Service/DjyUserConfig/IDjyUserConfigService.cs
Unescape Escape View File

@ -11,6 +11,6 @@ namespace Myshipping.Core.Service
Task Add(AddDjyUserConfigInput input);
Task Update(UpdateDjyUserConfigInput input);
Task Delete(GetDjyUserConfigInput input);
Task<DjyUserConfig> Get([FromQuery] DjyUserConfigType type);
Task<DjyUserConfig> Get([FromQuery] string type);
}
}
Write Preview
Loading…
Cancel
Save