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

17
EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs
View File

@@ -32,13 +32,13 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task<dynamic> GetEquipWorkshopChangeList(EquipQueryInput input)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
// Dictionary<string, string>? queryJson = new Dictionary<string, string>();
// if (input!=null && !string.IsNullOrEmpty(input.queryJson))
// {
// queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input?.queryJson ?? "");
// }
var result = await db.Queryable<EqpWorkshopChangeLog>()
SqlSugarPagedList<EquipWorkshopChangeQueryOutput> result = await db.Queryable<EqpWorkshopChangeLog>()
.LeftJoin<OrganizeEntity>((a, b) => a.old_workshop_id == b.Id)
.LeftJoin<OrganizeEntity>((a, b, c) => a.new_workshop_id == c.Id)
.WhereIF(input != null, a => a.equip_id == input!.equip_id)
@@ -52,7 +52,7 @@ namespace Tnb.EquipMgr
new_installation_location = a.new_installation_location,
remark = a.remark,
create_time = a.create_time == null ? null : a.create_time.Value.ToString("yyyy-MM-dd"),
}).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));
}).ToPagedListAsync(input?.currentPage ?? 1, input?.pageSize ?? 50);
return PageResult<EquipWorkshopChangeQueryOutput>.SqlSugarPageResult(result);
}
@@ -60,12 +60,12 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task<dynamic> WorkshopChange(EquipWorkshopChangeInput input)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
EqpEquipment eqpEquipment = await db.Queryable<EqpEquipment>().SingleAsync(x => x.id == input.equip_id);
EqpWorkshopChangeLog eqpWorkshopChangeLog = new EqpWorkshopChangeLog()
EqpWorkshopChangeLog eqpWorkshopChangeLog = new()
{
equip_id = input.equip_id,
old_workshop_id = eqpEquipment.use_department_id,
@@ -78,17 +78,16 @@ namespace Tnb.EquipMgr
org_id = _userManager.GetUserInfo().Result.organizeId
};
await _repository.InsertAsync(eqpWorkshopChangeLog);
_ = await _repository.InsertAsync(eqpWorkshopChangeLog);
await db.Updateable<EqpEquipment>()
_ = await db.Updateable<EqpEquipment>()
.SetColumns(x => x.use_department_id == input.new_workshop_id)
.SetColumns(x => x.installation_location == input.new_installation_location)
.Where(x => x.id == input.equip_id).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "迁移成功" : result.ErrorMessage;
return !result.IsSuccess ? throw Oops.Oh(ErrorCode.COM1008) : (dynamic)(result.IsSuccess ? "迁移成功" : result.ErrorMessage);
}
}
}