周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 db65a7dfc78ec0301e8f8c63ed24922d7dba3295 2 个父辈 25f588b7 5d8e5e4f

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !2791
内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 4 行删除
@@ -145,9 +145,9 @@ class AsideTicketController extends BaseController @@ -145,9 +145,9 @@ class AsideTicketController extends BaseController
145 if(!empty($lists) && !empty($lists['list'])){ 145 if(!empty($lists) && !empty($lists['list'])){
146 $manageModel = new Manage(); 146 $manageModel = new Manage();
147 foreach ($lists['list'] as $key => $item){ 147 foreach ($lists['list'] as $key => $item){
148 -// if($item['project']['version'] != 5){  
149 -// $item['project_id']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);  
150 -// } 148 + if($item['project']['version'] != 5){
  149 + $item['project']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
  150 + }
151 //计算超时多少个小时 151 //计算超时多少个小时
152 if($item['status'] == 0){ 152 if($item['status'] == 0){
153 $end = date('Y-m-d H:i:s'); 153 $end = date('Y-m-d H:i:s');
@@ -252,7 +252,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -252,7 +252,7 @@ Route::middleware(['aloginauth'])->group(function () {
252 Route::any('/getUserTaskList', [Aside\Task\TaskController::class, 'getUserTaskList'])->name('admin.task_getUserTaskList'); 252 Route::any('/getUserTaskList', [Aside\Task\TaskController::class, 'getUserTaskList'])->name('admin.task_getUserTaskList');
253 }); 253 });
254 // 售后工单改版 254 // 售后工单改版
255 - Route::prefix('tickets')->group(function () { 255 + Route::prefix('ticketstickets')->group(function () {
256 Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表'); 256 Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表');
257 Route::post('/lists', [Aside\WorkOrder\AsideTicketController::class, 'lists'])->name('admin.tickets.lists')->summary('A端工单列表2'); 257 Route::post('/lists', [Aside\WorkOrder\AsideTicketController::class, 'lists'])->name('admin.tickets.lists')->summary('A端工单列表2');
258 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单'); 258 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');