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

update 新增机构类型

Browse Source
This commit is contained in:
自带大佬气场
2021-05-21 16:10:08 +08:00
parent e4696f678e
commit c8530039eb
7 changed files with 83 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Api/Ewide.Core/Entity/SysOrg.cs
View File

@@ -37,6 +37,12 @@ namespace Ewide.Core
[Comment("编码")]
public string Code { get; set; }
/// <summary>
/// 机构类型
/// </summary>
[Comment("机构类型")]
public int Type { get; set; }
/// <summary>
/// 联系人
/// </summary>

10
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -1338,6 +1338,11 @@
编码
</summary>
</member>
<member name="P:Ewide.Core.SysOrg.Type">
<summary>
机构类型
</summary>
</member>
<member name="P:Ewide.Core.SysOrg.Contacts">
<summary>
联系人
@@ -5520,6 +5525,11 @@
编码
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgInput.Type">
<summary>
机构类型
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgInput.Tel">
<summary>
电话

2
Api/Ewide.Core/Extension/PageExtensions.cs
View File

@@ -22,7 +22,7 @@ namespace Ewide.Core.Extension
return orderStr;
}
private static string OrderBuilder<T>(PageInputBase pageInput, bool descSort = true)
private static string OrderBuilder<T>(PageInputBase pageInput, bool descSort = false)
{
var type = typeof(T);
var hasId = type.GetProperty("Id") != null;

16
Api/Ewide.Core/Service/Dict/SysDictTypeService.cs
View File

@@ -99,7 +99,7 @@ namespace Ewide.Core.Service
{
var isExist = await _sysDictTypeRep.AnyAsync(u => u.Name == input.Name, false);
if (isExist) throw Oops.Oh(ErrorCode.D3001);
var dictTypeEntity = _sysDictTypeRep.Where(s => s.Pid == input.Pid).FirstOrDefault();
var dictTypeEntity = _sysDictTypeRep.Where(s => s.Id == input.Pid).FirstOrDefault();
if (dictTypeEntity != null && dictTypeEntity.Code != null) throw new Exception("此类型下不能添加子类型");
var dictType = input.Adapt<SysDictType>();
dictType.Pids = await CreateNewPids(input.Pid);
@@ -132,14 +132,14 @@ namespace Ewide.Core.Service
[HttpPost("/sysDictType/edit"),]
public async Task UpdateDictType(UpdateDictTypeInput input)
{
var isExist = await _sysDictTypeRep.AnyAsync(u => u.Id == input.Id, false);
if (!isExist) throw Oops.Oh(ErrorCode.D3000);
if (input.Id == input.Pid) throw Oops.Oh(ErrorCode.D4006);
var result = _sysDictTypeRep.Where(u => u.Id == input.Id).Select(s => new { s.Name, s.Id, s.Code }).ToList().First();
if (result == null) throw Oops.Oh(ErrorCode.D3000);
if (result.Name == input.Name) throw Oops.Oh(ErrorCode.D3001);
// 如果是编辑，父id不能为自己的子节点
//var childIdList = await _sysDictTypeRep.DetachedEntities.Where(u => u.Pids.Contains(input.Id.ToString()))
// .Select(u => u.Id).ToListAsync();
//if (childIdList.Contains(input.Pid)) throw Oops.Oh(ErrorCode.D4006);
// 排除自己并且判断与其他是否相同
isExist = await _sysDictTypeRep.AnyAsync(u => (u.Name == input.Name || u.Code == input.Code) && u.Id != input.Id, false);
if (isExist) throw Oops.Oh(ErrorCode.D3001);
var dictType = input.Adapt<SysDictType>();
dictType.Pids = await CreateNewPids(input.Pid);

5
Api/Ewide.Core/Service/Org/Dto/OrgInput.cs
View File

@@ -27,6 +27,11 @@ namespace Ewide.Core.Service
/// </summary>
public virtual string Code { get; set; }
/// <summary>
/// 机构类型
/// </summary>
public virtual int Type { get; set; }
/// <summary>
/// 电话
/// </summary>