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

26
EquipMgr/Tnb.EquipMgr/EquipmentService.cs
View File

@@ -55,13 +55,13 @@ namespace Tnb.EquipMgr
/// <returns></returns>
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
var dic = new Dictionary<string, string>
Dictionary<string, string> dic = new()
{
{ "Qualified","合格"},
{ "Unqualified","不合格"},
};
var pagedList = await _repository.AsQueryable()
SqlSugarPagedList<EquipmentListOutput> pagedList = await _repository.AsQueryable()
//.Where(it => it.station_code == input.station_code || string.IsNullOrEmpty(input.station_code))
.Select(it => new EquipmentListOutput
{
@@ -82,7 +82,7 @@ namespace Tnb.EquipMgr
private async Task<dynamic> Create(VisualDevModelDataCrInput visualDevModelDataCrInput)
{
string qrcode = visualDevModelDataCrInput.data.ContainsKey("qrcode") ? visualDevModelDataCrInput.data["qrcode"]?.ToString() : "";
string? qrcode = visualDevModelDataCrInput.data.ContainsKey("qrcode") ? visualDevModelDataCrInput.data["qrcode"]?.ToString() : "";
if (!string.IsNullOrEmpty(qrcode) && await _repository.AsSugarClient().Queryable<BasQrcode>().AnyAsync(x => x.code == qrcode))
{
throw Oops.Bah("二维码总表中已存在该二维码");
@@ -96,7 +96,7 @@ namespace Tnb.EquipMgr
if (!string.IsNullOrEmpty(qrcode))
{
BasQrcode basQrcode = new BasQrcode()
BasQrcode basQrcode = new()
{
code = visualDevModelDataCrInput.data["qrcode"].ToString(),
source_id = equipId,
@@ -105,7 +105,7 @@ namespace Tnb.EquipMgr
create_time = DateTime.Now,
org_id = _userManager.GetUserInfo().Result.organizeId,
};
await _repository.AsSugarClient().Insertable<BasQrcode>(basQrcode).ExecuteCommandAsync();
_ = await _repository.AsSugarClient().Insertable<BasQrcode>(basQrcode).ExecuteCommandAsync();
}
}
return await Task.FromResult(true);
@@ -113,7 +113,7 @@ namespace Tnb.EquipMgr
private async Task<dynamic> Update(string id, VisualDevModelDataUpInput visualDevModelDataUpInput)
{
string qrcode = visualDevModelDataUpInput.data.ContainsKey("qrcode") ? visualDevModelDataUpInput.data["qrcode"]?.ToString() : "";
string? qrcode = visualDevModelDataUpInput.data.ContainsKey("qrcode") ? visualDevModelDataUpInput.data["qrcode"]?.ToString() : "";
if (!string.IsNullOrEmpty(qrcode) && await _repository.AsSugarClient().Queryable<BasQrcode>().AnyAsync(x => x.code == visualDevModelDataUpInput.data["qrcode"] && x.source_id != id))
{
throw Oops.Bah("二维码总表中已存在该二维码");
@@ -127,13 +127,13 @@ namespace Tnb.EquipMgr
{
if (await _repository.AsSugarClient().Queryable<BasQrcode>().AnyAsync(x => x.source_id == id))
{
await _repository.AsSugarClient().Updateable<BasQrcode>()
_ = await _repository.AsSugarClient().Updateable<BasQrcode>()
.SetColumns(x => x.code == visualDevModelDataUpInput.data["qrcode"].ToString()).Where(x => x.source_id == id)
.ExecuteCommandAsync();
}
else
{
BasQrcode basQrcode = new BasQrcode()
BasQrcode basQrcode = new()
{
code = visualDevModelDataUpInput.data["qrcode"].ToString(),
source_id = id,
@@ -142,7 +142,7 @@ namespace Tnb.EquipMgr
create_time = DateTime.Now,
org_id = _userManager.GetUserInfo().Result.organizeId,
};
await _repository.AsSugarClient().Insertable<BasQrcode>(basQrcode).ExecuteCommandAsync();
_ = await _repository.AsSugarClient().Insertable<BasQrcode>(basQrcode).ExecuteCommandAsync();
}
}
}
@@ -169,8 +169,8 @@ namespace Tnb.EquipMgr
public async Task<dynamic> GetWorklineAndEquipTree(Dictionary<string, string> dic)
{
string equipTypes = dic.ContainsKey("equipTypes") ? dic["equipTypes"] : "";
var db = _repository.AsSugarClient();
var queryable1 = db.Queryable<OrganizeEntity>()
ISqlSugarClient db = _repository.AsSugarClient();
ISugarQueryable<WorklineAndEquipTreeOutput> queryable1 = db.Queryable<OrganizeEntity>()
.Where((a) => a.DeleteMark == null && a.Category == DictConst.RegionCategoryWorkshopCode)
.Select((a) => new WorklineAndEquipTreeOutput()
{
@@ -191,7 +191,7 @@ namespace Tnb.EquipMgr
})
});
List<WorklineAndEquipTreeOutput> list2 = new List<WorklineAndEquipTreeOutput>();
List<WorklineAndEquipTreeOutput> list2 = new();
if (!string.IsNullOrEmpty(equipTypes))
{
string[] equipTypeArr = equipTypes.Split(",");
@@ -219,7 +219,7 @@ namespace Tnb.EquipMgr
}
// var list = await db.UnionAll(queryable1, queryable2).ToListAsync();
var list1 = await queryable1.ToListAsync();
List<WorklineAndEquipTreeOutput> list1 = await queryable1.ToListAsync();
list1.AddRange(list2);
return new AuthResponse(200, "", new Dictionary<string, object>()
{