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

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EquipMgr/Tnb.EquipMgr/EqpDaqService.cs
View File

@@ -32,13 +32,13 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task<dynamic> GetEquipDaqList(EquipQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string>? queryJson = new Dictionary<string, string>();
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, string>? queryJson = new();
if (input != null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
}
var result = await db.Queryable<EqpDaq>()
SqlSugarPagedList<EquipDaqQueryOutput> result = await db.Queryable<EqpDaq>()
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.WhereIF(input != null, a => a.equip_id == input!.equip_id)
.WhereIF(queryJson != null && queryJson.ContainsKey("data_source"), a => a.data_source == queryJson!["data_source"])
@@ -56,7 +56,7 @@ namespace Tnb.EquipMgr
label_name = a.label_name,
label_point = a.label_point,
remark = a.remark
}).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));
}).ToPagedListAsync(input?.currentPage ?? 1, input?.pageSize ?? 50);
return PageResult<EquipDaqQueryOutput>.SqlSugarPageResult(result);
}