|
...
|
...
|
@@ -25,7 +25,7 @@ class AsideTicketController extends BaseController |
|
|
|
{
|
|
|
|
$validated = $request->validated();
|
|
|
|
$lists = Tickets::with([
|
|
|
|
'logs.engineer:id,name',
|
|
|
|
'logs.engineer',
|
|
|
|
'project.pm',
|
|
|
|
])
|
|
|
|
->when(!empty($validated['engineer_id']), function ($query) use ($validated) {
|
|
...
|
...
|
@@ -144,13 +144,12 @@ class AsideTicketController extends BaseController |
|
|
|
$ticket->submit_side = 1; // 1 for A-side submission
|
|
|
|
$ticket->submit_user_id = $this->manage['id'];
|
|
|
|
$ticket->submit_username = $this->manage['name'];
|
|
|
|
$ticket->star = $request->input('star', 3);
|
|
|
|
$ticket->plan_end_at = $request->input('plan_end_at', null);
|
|
|
|
$ticket->save();
|
|
|
|
// A 端提工单,都是针对客户提的需求等开发任务;比如翻译,修改页面等。。。
|
|
|
|
foreach ($request->input('engineer_ids', []) as $engineer_id) {
|
|
|
|
$log = new TicketLog();
|
|
|
|
$log->engineer_id = $engineer_id;
|
|
|
|
$ticket->logs()->save($log);
|
|
|
|
}
|
|
|
|
|
|
|
|
// 分配工单参与人
|
|
|
|
$this->saveEngineers($request->input('engineer_ids', []));
|
|
|
|
$project->pushWechatGroupMsg("创贸({$ticket->submit_username})新增了工单(ID:{$ticket->id}),请及时处理!");
|
|
|
|
return $ticket;
|
|
|
|
});
|
|
...
|
...
|
@@ -189,19 +188,11 @@ class AsideTicketController extends BaseController |
|
|
|
// 开始修改
|
|
|
|
$result = DB::transaction(function () use ($request, $ticket) {
|
|
|
|
if ($request->input('engineer_ids'))
|
|
|
|
{
|
|
|
|
// 有邀请工程师协同处理
|
|
|
|
foreach ($request->input('engineer_ids') as $engineer_id)
|
|
|
|
{
|
|
|
|
try {
|
|
|
|
// 利用唯一索引去重
|
|
|
|
$new_log = new TicketLog();
|
|
|
|
$new_log->engineer_id = $engineer_id;
|
|
|
|
$ticket->logs()->save($new_log);
|
|
|
|
}catch (\Exception $exception){}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$ticket->saveEngineers($request->input('engineer_ids'));
|
|
|
|
|
|
|
|
// 其他字段有提交数据才修改,比如star plan_end_at
|
|
|
|
$ticket->star = $request->input('star', $ticket->star);
|
|
|
|
$ticket->plan_end_at = $request->input('plan_end_at', $ticket->plan_end_at);
|
|
|
|
$ticket->reply = $request->input('reply', null);
|
|
|
|
$ticket->status = $request->input('status', $ticket->status);
|
|
|
|
if ($ticket->status == Tickets::STATUS_COMPLETED)
|
...
|
...
|
|