This commit is contained in:
2023-06-30 13:51:23 +08:00
parent 43f8c50c7e
commit 9931b433f8
5 changed files with 43 additions and 2 deletions

View File

@@ -10,5 +10,12 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="dic"></param>
/// <returns></returns>
public Task<EqpEquipment> GetEntityById(Dictionary<string, string> dic);
/// <summary>
/// 根据设备类型获取设备列表
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
public Task<dynamic> GetListByTypeId(Dictionary<string, string> dic);
}
}

View File

@@ -69,5 +69,14 @@ namespace Tnb.EquipMgr
string id = dic["id"];
return await _repository.GetSingleAsync(x => x.id == id);
}
[HttpPost]
public async Task<dynamic> GetListByTypeId(Dictionary<string, string> dic)
{
string typeIds = dic["typeIds"];
string[] typeIdArr = typeIds.Split(",");
return await _repository.AsSugarClient().Queryable<EqpEquipment>().Where(x => typeIdArr.Contains(x.equip_type_id))
.ToListAsync();
}
}
}

View File

@@ -69,8 +69,11 @@ namespace Tnb.EquipMgr
var pair = row[nameof(ToolMoldMaintainTask.mold_id)];
if (pair.IsNotEmptyOrNull())
{
var multi = _dicMold[pair.ToString()!];
row[nameof(ToolMoldMaintainTask.mold_id)] = $"{multi.code}/{multi.name}";
if(_dicMold.TryGetValue(pair.ToString(),out var multi))
{
row[nameof(ToolMoldMaintainTask.mold_id)] = $"{multi.code}/{multi.name}";
}
}
}
}