wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除warn

Browse Source
This commit is contained in:
周科达
2023-06-19 16:27:13 +08:00
parent 0b492898af
commit aea9e3a9d5
69 changed files with 512 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs
View File

@@ -14,6 +14,7 @@ using Tnb.EquipMgr.Interfaces;
namespace Tnb.EquipMgr
{
/// <summary>
/// 设备备品备件
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
@@ -34,20 +35,23 @@ namespace Tnb.EquipMgr
{
List<EqpEquipSpareParts> oldList = await _repository.GetListAsync(x => x.equip_id == input.equip_id);
List<EqpEquipSpareParts> list = new List<EqpEquipSpareParts>();
string orgId = _userManager.GetUserInfo().Result.organizeId;
foreach (var spare_parts_id in input.spare_parts_ids)
string orgId = _userManager?.GetUserInfo().Result.organizeId ?? "";
if (input != null && input.spare_parts_ids != null)
{
if (oldList.Any(x => x.spare_parts_id == spare_parts_id))
continue;
list.Add(new EqpEquipSpareParts()
foreach (var spare_parts_id in input.spare_parts_ids)
{
id = SnowflakeIdHelper.NextId(),
equip_id = input.equip_id,
spare_parts_id = spare_parts_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = orgId,
});
if (oldList.Any(x => x.spare_parts_id == spare_parts_id))
continue;
list.Add(new EqpEquipSpareParts()
{
id = SnowflakeIdHelper.NextId(),
equip_id = input.equip_id,
spare_parts_id = spare_parts_id,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = orgId,
});
}
}
await _repository.InsertRangeAsync(list);
@@ -57,7 +61,7 @@ namespace Tnb.EquipMgr
public async Task<dynamic> GetEquipSparePartsList(EquipQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string> queryJson = new Dictionary<string, string>();
Dictionary<string, string>? queryJson = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
@@ -67,8 +71,8 @@ namespace Tnb.EquipMgr
.LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"]))
.WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"]))
.Select((a, b, c,d) => new EquipSparePartsQueryOutput
{
id = a.id,