合并分支 'lyh-server' 到 'master'
gx 查看合并请求 !2531
正在显示
1 个修改的文件
包含
6 行增加
和
4 行删除
| @@ -11,6 +11,7 @@ namespace App\Console\Commands\Ticket; | @@ -11,6 +11,7 @@ namespace App\Console\Commands\Ticket; | ||
| 11 | 11 | ||
| 12 | use App\Models\Manage\BelongingGroup; | 12 | use App\Models\Manage\BelongingGroup; |
| 13 | use App\Models\Manage\ManageHr; | 13 | use App\Models\Manage\ManageHr; |
| 14 | +use App\Models\Ticket\TicketDailyCount; | ||
| 14 | use App\Models\Ticket\TicketDailyDeptCount; | 15 | use App\Models\Ticket\TicketDailyDeptCount; |
| 15 | use App\Models\Ticket\TicketDailyManageCount; | 16 | use App\Models\Ticket\TicketDailyManageCount; |
| 16 | use App\Models\WorkOrder\TicketLog; | 17 | use App\Models\WorkOrder\TicketLog; |
| @@ -174,11 +175,12 @@ class TicketCount extends Command | @@ -174,11 +175,12 @@ class TicketCount extends Command | ||
| 174 | 'processed_num'=>$processed_num, | 175 | 'processed_num'=>$processed_num, |
| 175 | 'source'=>json_encode(['a'=>$submit_a_side,'b'=>$submit_b_side]), | 176 | 'source'=>json_encode(['a'=>$submit_a_side,'b'=>$submit_b_side]), |
| 176 | ]; | 177 | ]; |
| 177 | - $ticketInfo = $ticketModel->read(['date'=>$date],['id']); | ||
| 178 | - if($ticketInfo === false){ | ||
| 179 | - $ticketModel->addReturnId($data); | 178 | + $ticketDailyModel = new TicketDailyCount(); |
| 179 | + $ticketDailyInfo = $ticketDailyModel->read(['date'=>$date],['id']); | ||
| 180 | + if($ticketDailyInfo === false){ | ||
| 181 | + $ticketDailyModel->addReturnId($data); | ||
| 180 | }else{ | 182 | }else{ |
| 181 | - $ticketModel->edit($data,['id'=>$ticketInfo['id']]); | 183 | + $ticketDailyModel->edit($data,['id'=>$ticketDailyInfo['id']]); |
| 182 | } | 184 | } |
| 183 | return true; | 185 | return true; |
| 184 | } | 186 | } |
-
请 注册 或 登录 后发表评论