维修添加状态判断

This commit is contained in:
2023-10-25 11:16:38 +08:00
parent 6268f63b0e
commit 06349a3468
2 changed files with 180 additions and 114 deletions

View File

@@ -111,23 +111,48 @@ namespace Tnb.EquipMgr
{
string id = dic["id"];
string repairerId = dic["repairerId"];
await _repository.UpdateAsync(x => new EqpRepairApply()
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==id);
if (eqpRepairApply.status == RepairApplyStatus.TOBEEXECUTED ||
eqpRepairApply.status == RepairApplyStatus.REFUSE)
{
repairer_id = repairerId,
status = RepairApplyStatus.TOBERECEIVED,
}, x => x.id == id);
return "指派成功";
await _repository.UpdateAsync(x => new EqpRepairApply()
{
repairer_id = repairerId,
status = RepairApplyStatus.TOBERECEIVED,
}, x => x.id == id);
return "指派成功";
}
else
{
throw Oops.Bah("状态错误");
}
}
[HttpPost]
public async Task<string> Receive(Dictionary<string, string> dic)
{
string id = dic["id"];
await _repository.UpdateAsync(x => new EqpRepairApply()
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==id);
if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED)
{
status = RepairApplyStatus.RECEIVED,
}, x => x.id == id);
return "接收成功";
if (_userManager.UserId == eqpRepairApply.repairer_id)
{
await _repository.UpdateAsync(x => new EqpRepairApply()
{
status = RepairApplyStatus.RECEIVED,
}, x => x.id == id);
return "接收成功";
}
else
{
throw Oops.Bah("该任务没有指派给您,无法接收");
}
}
else
{
throw Oops.Bah("状态错误");
}
}
[HttpPost]
@@ -138,21 +163,37 @@ namespace Tnb.EquipMgr
var db = _repository.AsSugarClient();
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
await _repository.UpdateAsync(x => new EqpRepairApply()
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==id);
if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED)
{
status = RepairApplyStatus.REFUSE,
}, x => x.id == id);
EqpRepairRefuse eqpRepairRefuse = new EqpRepairRefuse()
if (_userManager.UserId == eqpRepairApply.repairer_id)
{
await _repository.UpdateAsync(x => new EqpRepairApply()
{
status = RepairApplyStatus.REFUSE,
}, x => x.id == id);
EqpRepairRefuse eqpRepairRefuse = new EqpRepairRefuse()
{
repair_apply_id = id,
reason = reason,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = _userManager.GetUserInfo().Result.organizeId
};
await db.Insertable<EqpRepairRefuse>(eqpRepairRefuse).ExecuteCommandAsync();
}
else
{
throw Oops.Bah("该任务没有指派给您,无法拒绝");
}
}
else
{
repair_apply_id = id,
reason = reason,
create_id = _userManager.UserId,
create_time = DateTime.Now,
org_id = _userManager.GetUserInfo().Result.organizeId
};
await db.Insertable<EqpRepairRefuse>(eqpRepairRefuse).ExecuteCommandAsync();
throw Oops.Bah("状态错误");
}
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
if(!result.IsSuccess) throw Oops.Oh(result.ErrorMessage);
return "拒绝成功";
}
@@ -166,23 +207,39 @@ namespace Tnb.EquipMgr
[HttpPost]
public async Task<string> Register(RepairApplyRegisterInput input)
{
string status = input.is_out_apply==1 ? RepairApplyStatus.TOBEOUTAPPLY : RepairApplyStatus.COMPLETED;
await _repository.UpdateAsync(x => new EqpRepairApply()
EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x=>x.id==input.id);
if (eqpRepairApply.status == RepairApplyStatus.TOBERECEIVED)
{
fault_id = input.fault_id,
is_complete = input.is_complete,
complete_time = input.complete_time,
repair_take_time = input.repair_take_time,
is_halt = input.is_halt,
halt_take_time = input.halt_take_time,
repair_description = input.repair_description,
repair_img = input.repair_img,
is_out_apply = input.is_out_apply,
status = status,
}, x => x.id == input.id);
if (_userManager.UserId == eqpRepairApply.repairer_id)
{
string status = input.is_out_apply==1 ? RepairApplyStatus.TOBEOUTAPPLY : RepairApplyStatus.COMPLETED;
await _repository.UpdateAsync(x => new EqpRepairApply()
{
fault_id = input.fault_id,
is_complete = input.is_complete,
complete_time = input.complete_time,
repair_take_time = input.repair_take_time,
is_halt = input.is_halt,
halt_take_time = input.halt_take_time,
repair_description = input.repair_description,
repair_img = input.repair_img,
is_out_apply = input.is_out_apply,
status = status,
}, x => x.id == input.id);
return "登记成功";
}
else
{
throw Oops.Bah("您不是责任人");
}
}
else
{
throw Oops.Bah("状态错误");
}
return "登记成功";
}
[HttpPost]