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

57
EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
View File

@@ -48,7 +48,6 @@ namespace Tnb.EquipMgr
/// <summary>
/// 执行设备保养计划
/// </summary>
/// <param name="pageInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> ExecuteMaintain(SpotInsRecordExecuteInput input)
@@ -75,13 +74,16 @@ namespace Tnb.EquipMgr
execute_user_id = _userManager.UserId
}, x => x.id == input.id);
foreach (var item in input.details)
if (input != null && input.details != null)
{
await _repository.AsSugarClient().Updateable<EqpMaintainRecordD>()
.SetColumns(x=>x.result==item["result"])
.SetColumnsIF(item.ContainsKey("maintain_descrip"),x=>x.maintain_descrip==item["maintain_descrip"])
.Where(x=>x.id==item["id"])
.ExecuteCommandAsync();
foreach (var item in input.details)
{
await _repository.AsSugarClient().Updateable<EqpMaintainRecordD>()
.SetColumns(x=>x.result==item["result"])
.SetColumnsIF(item.ContainsKey("maintain_descrip"),x=>x.maintain_descrip==item["maintain_descrip"])
.Where(x=>x.id==item["id"])
.ExecuteCommandAsync();
}
}
@@ -114,7 +116,6 @@ namespace Tnb.EquipMgr
/// <summary>
/// 复核设备保养计划
/// </summary>
/// <param name="pageInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<string> RepeatMaintain(MaintainRecordRepeatInput input)
@@ -123,22 +124,28 @@ namespace Tnb.EquipMgr
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
foreach (var item in input.details)
if (input != null && input.details != null)
{
await db.Updateable<EqpMaintainRecordD>()
.SetColumns(x => x.repeat_descrip == item["repeat_descrip"])
.SetColumns(x => x.repeat_result == item["repeat_result"])
.Where(x => x.id == item["id"]).ExecuteCommandAsync();
foreach (var item in input.details)
{
await db.Updateable<EqpMaintainRecordD>()
.SetColumns(x => x.repeat_descrip == item["repeat_descrip"])
.SetColumns(x => x.repeat_result == item["repeat_result"])
.Where(x => x.id == item["id"]).ExecuteCommandAsync();
}
}
await _repository.UpdateAsync(x => new EqpMaintainRecordH()
if (input != null)
{
repeat_result = input.repeat_result,
repeat_remark = input.repeat_remark,
repeat_user_id = _userManager.UserId,
repeat_time = DateTime.Now,
status = SpotInsRecordExecutionStatus.COMPLETED
}, x => x.id == input.id);
await _repository.UpdateAsync(x => new EqpMaintainRecordH()
{
repeat_result = input.repeat_result,
repeat_remark = input.repeat_remark,
repeat_user_id = _userManager.UserId,
repeat_time = DateTime.Now,
status = SpotInsRecordExecutionStatus.COMPLETED
}, x => x.id == input.id);
}
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
@@ -149,7 +156,7 @@ namespace Tnb.EquipMgr
public async Task<dynamic> GetMaintainRecordList(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);
@@ -163,17 +170,17 @@ namespace Tnb.EquipMgr
{
id = a.id,
attachment = a.attachment,
create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
create_time = a.create_time==null ? null : a.create_time.Value.ToString("yyyy-MM-dd HH:mm"),
equip_id = b.code,
equip_id_id = a.equip_id,
repeat_remark = a.repeat_remark,
repeat_result = a.repeat_result=="1"?"合格":"不合格",
repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"),
repeat_time = a.repeat_time==null ? null : a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"),
repeat_user_id = d.RealName,
result = a.result=="1"?"合格":"不合格",
result_remark = a.result_remark,
maintain_tem_equip_id = a.maintain_tem_equip_id,
execute_time = a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"),
execute_time = a.execute_time==null ? null : a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"),
execute_user_id = c.RealName,
status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("")
}).ToPagedListAsync(input.currentPage, input.pageSize);