Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Console/Commands/SyncFilesImage/SyncProjectFile.php
app/Console/Commands/SyncFilesImage/SyncTimeFiles.php
app/Http/Controllers/Api/WorkOrder/TicketController.php
app/Http/Controllers/Aside/WorkOrder/AsideTicketController.php
app/Http/Logic/Aside/Geo/GeoLinkLogic.php
app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
routes/aside.php
--- a/app/Console/Commands/SyncFilesImage/SyncProjectFile.php
查看文件 @d0b8ce4
+++ b/app/Console/Commands/SyncFilesImage/SyncProjectFile.php
查看文件 @d0b8ce4
@@ -10,6 +10,7 @@
 namespace App\Console\Commands\SyncFilesImage;
 use App\Models\File\File;
+use App\Models\File\Image;
 use Illuminate\Console\Command;
 class SyncProjectFile extends Command
@@ -31,7 +32,7 @@ class SyncProjectFile extends Command
     public function handle(){
         $project_id = $this->argument('project_id');
-        $fileModel = new File();
+        $fileModel = new Image();
         $lists = $fileModel->list(['project_id'=>$project_id]);//未同步成功的图片及文件
         foreach ($lists as $k => $v){
             if(strpos($v['path'], '/181/') !== false ){
--- a/app/Console/Commands/SyncFilesImage/SyncTimeFiles.php
查看文件 @d0b8ce4
+++ b/app/Console/Commands/SyncFilesImage/SyncTimeFiles.php
查看文件 @d0b8ce4
@@ -10,6 +10,7 @@
 namespace App\Console\Commands\SyncFilesImage;
 use App\Models\File\File;
+use App\Models\File\Image;
 use Illuminate\Console\Command;
 class SyncTimeFiles extends Command
@@ -30,11 +31,11 @@ class SyncTimeFiles extends Command
     public function handle()
     {
-        $fileModel = new File();
-//        $imagesModel = new Image();
+//        $fileModel = new File();
+        $imagesModel = new Image();
         $start = '2025-08-28 00:00:00';
-        $end = '2025-08-29 59:00:00';
-        $lists = $fileModel->list(['created_at'=>['between',[$start,$end]]]);
+        $end = '2025-08-29 23:59:59';
+        $lists = $imagesModel->list(['created_at'=>['between',[$start,$end]]]);
         foreach ($lists as $v){
             $path = $v['path'];
             echo date('Y-m-d H:i:s') . ' | 图片链接：' . $path . PHP_EOL;
--- a/app/Http/Controllers/Api/WorkOrder/TicketController.php
查看文件 @d0b8ce4
+++ b/app/Http/Controllers/Api/WorkOrder/TicketController.php
查看文件 @d0b8ce4
@@ -221,7 +221,7 @@ class TicketController extends BaseController
         $data['record'] = array_filter($data['record'], function($item) {
             return $item['date'] > '2025-09-01';
         });
-        if($project['type'] == 2 || $project['deploy_build']['seo_plan'] > 0){
+        if($project['type'] == 2 || ($project['deploy_build']['seo_plan'] > 0 && ($project['deploy_build']['plan'] == 0))){
             //优化项目  默认在seo优化中
             if($data['optimize_record'] == 0) {
                 $data['optimize_record'] = 1;
--- a/app/Http/Controllers/Aside/WorkOrder/AsideTicketController.php
查看文件 @d0b8ce4
+++ b/app/Http/Controllers/Aside/WorkOrder/AsideTicketController.php
查看文件 @d0b8ce4
@@ -145,9 +145,9 @@ class AsideTicketController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
             $manageModel = new Manage();
             foreach ($lists['list'] as $key => $item){
-//                if($item['project']['version'] != 5){
-//                    $item['project_id']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
-//                }
+                if($item['project']['version'] != 5){
+                    $item['project']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
+                }
                 //计算超时多少个小时
                 if($item['status'] == 0){
                     $end = date('Y-m-d H:i:s');
--- a/app/Http/Logic/Aside/Geo/GeoLinkLogic.php
查看文件 @d0b8ce4
+++ b/app/Http/Logic/Aside/Geo/GeoLinkLogic.php
查看文件 @d0b8ce4
@@ -73,7 +73,7 @@ class GeoLinkLogic extends BaseLogic
                 foreach ($this->param['data'] as $item){
                     $data[] = [
                         'project_id'=>$this->param['project_id'],
-                        'da'=>$item['da'] ?? '',
+                        'da'=>$item['da'] ?? 0,
                         'url'=>$item['url'],
                         'send_time'=>$item['send_time']
                     ];
--- a/app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
查看文件 @d0b8ce4
+++ b/app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
查看文件 @d0b8ce4
@@ -64,7 +64,7 @@ class ProcessRecordsLogic extends BaseLogic
 //        $data['record'] = array_filter($data['record'], function($item) {
 //            return $item['date'] > '2025-09-01';
 //        });
-        if($project['type'] == 2 || $project['deploy_build']['seo_plan'] > 0){
+        if($project['type'] == 2 || ($project['deploy_build']['seo_plan'] > 0 && ($project['deploy_build']['plan'] == 0))){
             //优化项目  默认在seo优化中
             if($data['optimize_record'] == 0) {
                 $data['optimize_record'] = 1;
--- a/routes/aside.php
查看文件 @d0b8ce4
+++ b/routes/aside.php
查看文件 @d0b8ce4
@@ -254,7 +254,6 @@ Route::middleware(['aloginauth'])->group(function () {
     // 售后工单改版
     Route::prefix('tickets')->group(function () {
         Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表');
-        Route::post('/lists', [Aside\WorkOrder\AsideTicketController::class, 'lists'])->name('admin.tickets.lists')->summary('A端工单列表2');
         Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
         Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
         Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');