ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
Xy
2021-04-23 10:56:40 +00:00
parent 02b5311f9a
commit 9398e6cf7a
17 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Api/Dilon.Core/Service/Dict/Dto/DictDataInput.cs
View File

@@ -11,7 +11,7 @@ namespace Dilon.Core.Service
/// <summary>
/// 字典类型Id
/// </summary>
public virtual long TypeId { get; set; }
public virtual string TypeId { get; set; }
/// <summary>
/// 值
@@ -45,7 +45,7 @@ namespace Dilon.Core.Service
/// 字典类型Id
/// </summary>
[Required(ErrorMessage = "字典类型Id不能为空"), DataValidation(ValidationTypes.Numeric)]
public long TypeId { get; set; }
public string TypeId { get; set; }
}
public class AddDictDataInput : DictDataInput
@@ -54,7 +54,7 @@ namespace Dilon.Core.Service
/// 字典类型Id
/// </summary>
[Required(ErrorMessage = "字典类型Id不能为空"), DataValidation(ValidationTypes.Numeric)]
public override long TypeId { get; set; }
public override string TypeId { get; set; }
/// <summary>
/// 值
@@ -75,7 +75,7 @@ namespace Dilon.Core.Service
/// 字典值Id
/// </summary>
[Required(ErrorMessage = "字典值Id不能为空"), DataValidation(ValidationTypes.Numeric)]
public long Id { get; set; }
public string Id { get; set; }
}
public class UpdateDictDataInput : AddDictDataInput
@@ -84,7 +84,7 @@ namespace Dilon.Core.Service
/// 字典值Id
/// </summary>
[Required(ErrorMessage = "字典值Id不能为空"), DataValidation(ValidationTypes.Numeric)]
public long Id { get; set; }
public string Id { get; set; }
}
public class QueryDictDataInput : DeleteDictDataInput

4
Api/Dilon.Core/Service/Dict/Dto/DictTreeOutput.cs
View File

@@ -10,12 +10,12 @@ namespace Dilon.Core.Service
/// <summary>
/// Id
/// </summary>
public long Id { get; set; }
public string Id { get; set; }
/// <summary>
/// 父Id
/// </summary>
public long Pid { get; set; }
public string Pid { get; set; }
/// <summary>
/// 编码-对应字典值的编码

4
Api/Dilon.Core/Service/Dict/Dto/DictTypeInput.cs
View File

@@ -54,7 +54,7 @@ namespace Dilon.Core.Service
/// 编号Id
/// </summary>
[Required(ErrorMessage = "字典类型Id不能为空")]
public long Id { get; set; }
public string Id { get; set; }
}
public class UpdateDictTypeInput : AddDictTypeInput
@@ -63,7 +63,7 @@ namespace Dilon.Core.Service
/// Id
/// </summary>
[Required(ErrorMessage = "字典类型Id不能为空")]
public long Id { get; set; }
public string Id { get; set; }
}
public class DropDownDictTypeInput

4
Api/Dilon.Core/Service/Dict/ISysDictDataService.cs
View File

@@ -7,11 +7,11 @@ namespace Dilon.Core.Service
{
Task AddDictData(AddDictDataInput input);
Task ChangeDictDataStatus(UpdateDictDataInput input);
Task DeleteByTypeId(long dictTypeId);
Task DeleteByTypeId(string dictTypeId);
Task DeleteDictData(DeleteDictDataInput input);
Task<dynamic> GetDictData([FromQuery] QueryDictDataInput input);
Task<dynamic> GetDictDataList([FromQuery] QueryDictDataListInput input);
Task<dynamic> GetDictDataListByDictTypeId(long dictTypeId);
Task<dynamic> GetDictDataListByDictTypeId(string dictTypeId);
Task<dynamic> QueryDictDataPageList([FromQuery] DictDataInput input);
Task UpdateDictData(UpdateDictDataInput input);
}

4
Api/Dilon.Core/Service/Dict/SysDictDataService.cs
View File

@@ -136,7 +136,7 @@ namespace Dilon.Core.Service
/// <param name="dictTypeId"></param>
/// <returns></returns>
[NonAction]
public async Task<dynamic> GetDictDataListByDictTypeId(long dictTypeId)
public async Task<dynamic> GetDictDataListByDictTypeId(string dictTypeId)
{
return await _sysDictDataRep.DetachedEntities.Where(u => u.SysDictType.Id == dictTypeId)
.Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort)
@@ -152,7 +152,7 @@ namespace Dilon.Core.Service
/// </summary>
/// <param name="dictTypeId"></param>
[NonAction]
public async Task DeleteByTypeId(long dictTypeId)
public async Task DeleteByTypeId(string dictTypeId)
{
var dictDatas = await _sysDictDataRep.Where(u => u.TypeId == dictTypeId).ToListAsync();
dictDatas.ForEach(u =>