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

@@ -74,9 +74,9 @@ class lyhDemo extends Command
         $lists = $projectModel->list(['delete_status' => 0,'id'=>1,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         $lists = $projectModel->list(['delete_status' => 0,'id'=>1,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         foreach ($lists as $item) {
         foreach ($lists as $item) {
             echo date('Y-m-d H:i:s') . '开始--项目的id:' . $item['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . '开始--项目的id:' . $item['id'] . PHP_EOL;
-            ProjectServer::useProject($item['project_id']);
+            ProjectServer::useProject($item['id']);
             $aiblog = new AiBlog();
             $aiblog = new AiBlog();
-            $task_ids = $aiblog->selectField(['image'=>'','created_at'=>['>=','2025-11-17 00:00:00']],'691b5b8a9632e');
+            $task_ids = $aiblog->selectField(['image'=>''],'id');
             dd($task_ids);
             dd($task_ids);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }

@@ -239,6 +239,7 @@ class IndexController extends BaseController
             'pr_id' => $this->param['pr_id'] ?? '',
             'pr_id' => $this->param['pr_id'] ?? '',
             'release_time_start'=>$this->param['release_time_start'] ?? '',
             'release_time_start'=>$this->param['release_time_start'] ?? '',
             'release_time_end'=>$this->param['release_time_end'] ?? '',
             'release_time_end'=>$this->param['release_time_end'] ?? '',
+            'headline'=>$this->param['headline'] ?? '',
         ];
         ];
         $param = array_filter($param);
         $param = array_filter($param);
         $response = Http::withHeaders(['Accept' => 'application/json',])->get($url, $param);
         $response = Http::withHeaders(['Accept' => 'application/json',])->get($url, $param);

@@ -10,6 +10,7 @@ use App\Http\Requests\Aside\WorkOrder\AsideTicketUpdateRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Http\Requests\Aside\WorkOrder\TicketProjectListRequest;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
+use App\Models\Ticket\TicketUploadData;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
@@ -214,6 +215,24 @@ class AsideTicketController extends BaseController
                     return $query->where('id', 0); // 返回空结果
                     return $query->where('id', 0); // 返回空结果
                 }
                 }
             })
             })
+            //待审核项目列表
+            ->when(!empty($this->param['pending_review']), function ($query) use ($validated) {
+                // 查找项目名称或公司名称
+                $ticketUploadModel = new TicketUploadData();
+                if(!isset($this->param['project_type']) || empty($this->param['project_type'])){
+                    $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
+                    $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
+                    return $query->whereIn('post_id', $projectIds)->orWhereIn('table_id', $projectV6Ids);
+                }else{
+                    if($this->param['project_type'] == 2){
+                        $projectV6Ids = $ticketUploadModel->where('status', 0)->where('project_type',2)->distinct('project_id')->pluck('project_id')->toArray();
+                        return $query->whereIn('table_id', $projectV6Ids);
+                    }elseif ($this->param['project_type'] == 1){
+                        $projectIds = $ticketUploadModel->where('status', 0)->where('project_type',1)->distinct('project_id')->pluck('project_id')->toArray();
+                        return $query->whereIn('post_id', $projectIds);
+                    }
+                }
+            })
             ->when(!empty($validated['search']), function ($query) use ($validated) {
             ->when(!empty($validated['search']), function ($query) use ($validated) {
                 // 查找项目名称或公司名称
                 // 查找项目名称或公司名称
                 $search = $validated['search'];
                 $search = $validated['search'];

@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Bside\ExtensionModule;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
+use App\Models\ExtentModule\ExtensionModuleField;
 use App\Models\ExtentModule\ExtensionModuleValue;
 use App\Models\ExtentModule\ExtensionModuleValue;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 
 
@@ -98,12 +99,39 @@ class Extension3915ModuleController extends BaseController
      */
      */
     public function importData()
     public function importData()
     {
     {
+        $this->request->validate([
+            'module_id'=>'required',
+        ],[
+            'module_id.required' => '模块id不能为空',
+        ]);
+        $moduleFieldModel = new ExtensionModuleField();
+        $filedList = $moduleFieldModel->where(['module_id' => $this->param['module_id']])->pluck('field_name', 'id')->toArray();
+        if(empty($filedList)){
+            $this->response('请先设置字段，再添加数据',Code::SUCCESS);
+        }
         $data = $this->param;
         $data = $this->param;
+        $moduleValueModel = new ExtensionModuleValue();
         //todo::优先截断表
         //todo::优先截断表
+        $moduleValueModel->truncate();
+        $key_filedId = [];
         $resultData = [];
         $resultData = [];
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
-
+            foreach ($v as $k1 => $v1){
+                if($k == 0){
+                    if(isset($filedList[$v1])){
+                        $key_filedId[$k1] = $filedList[$v1];
+                    }
+                    continue;
+                }
+                $resultData[] = [
+                    'uuid'=>$k + 1,
+                    'modile_id'=>$this->param['module_id'],
+                    'field_id'=>$key_filedId[$k1],
+                    'value'=>$v1 ?? '',
+                ];
+            }
         }
         }
-        return $data;
+        $moduleValueModel->insertAll($resultData);
+        $this->response('success',Code::SUCCESS,$resultData);
     }
     }
 }
 }

@@ -81,6 +81,7 @@ return [
             'cdn' => env('COS_CDN'),
             'cdn' => env('COS_CDN'),
             'cdn1' => env('COS_CDN1'),
             'cdn1' => env('COS_CDN1'),
             'cdn2' => env('COS_CDN2'),
             'cdn2' => env('COS_CDN2'),
+            'cdn3' => env('COS_CDN3'),
             'timeout' => 60,
             'timeout' => 60,
             'connect_timeout' => 60,
             'connect_timeout' => 60,
         ],
         ],