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

gx



查看合并请求 !2758

@@ -599,6 +599,22 @@ class ProjectController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :工单中获取
+     * @name   :get_process_records
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/9 15:28
+     */
+    public function get_project_records(Request $request, ProcessRecordsLogic $logic){
+        $request->validate([
+            'project_id'=>'required'
+        ],[
+            'project_id.required' => '项目ID不能为空'
+        ]);
+        $data = $logic->getRecordInfo($this->param['project_id']);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+    /**
      * 保存进程记录
      * 保存进程记录
      * @author zbj
      * @author zbj
      * @date 2023/6/25
      * @date 2023/6/25

@@ -369,4 +369,5 @@ class AsideTicketController extends BaseController
         $this->response('success', Code::SUCCESS);
         $this->response('success', Code::SUCCESS);
     }
     }
 
 
+
 }
 }

@@ -97,6 +97,63 @@ class ProcessRecordsLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :工单中获取建站进程
+     * @name   :getRecordInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/9 15:30
+     */
+    public function getRecordInfo($project_id)
+    {
+        $data = $this->model->read(['project_id'=>$project_id]);
+        $project = ProjectLogic::instance()->getProjectInfo($project_id);
+        if(!$data){
+            $data = [
+                'project_id' => $project_id,
+                'record' => [],
+                'remark' => '',
+                'project_record'=>0,
+                'optimize_record'=>0,
+                'type'=>$project['type']
+            ];
+        }
+        $data['record'] = array_filter($data['record'], function($item) {
+            return $item['date'] > '2025-09-01';
+        });
+        if($project['type'] == 2){
+            //优化项目  默认在seo优化中
+            if($data['optimize_record'] == 0) {
+                $data['optimize_record'] = 1;
+            }
+            //时间大于优化时间，默认
+            if(date('Y-m-d') > $project['deploy_optimize']['start_date']){
+                $data['optimize_record'] = 2;
+            }
+            //首次达标时间
+            if(!empty($project['deploy_optimize']['first_compliance_time'])){
+                $data['optimize_record'] = 3;
+            }
+            //无剩余时间
+            if($project['project_type'] == 1){
+                if($project['remain_day'] == 0){
+                    $data['optimize_record'] = 4;
+                }
+            }else{
+                if($project['seo_remain_day'] == 0){
+                    $data['optimize_record'] = 4;
+                }
+            }
+            if(in_array(2,$project['level'])){
+                $data['date_project_record'] = ['暂停优化'];
+            }else{
+                $data['date_project_record'] = Project::projectProgress('optimize');
+            }
+        }else{
+            $data['date_project_record'] = Project::projectProgress('build');
+        }
+        return $this->success($data);
+    }
+    /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :recordSave
      * @name   :recordSave
      * @author :lyh
      * @author :lyh

@@ -178,6 +178,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/deleteMinorLanguages', [Aside\Project\ProjectController::class, 'deleteMinorLanguages'])->name('admin.project_deleteMinorLanguages');
         Route::any('/deleteMinorLanguages', [Aside\Project\ProjectController::class, 'deleteMinorLanguages'])->name('admin.project_deleteMinorLanguages');
         Route::any('/inquiry_set', [Aside\Project\ProjectController::class, 'inquiry_set'])->name('admin.project_inquiry_set');
         Route::any('/inquiry_set', [Aside\Project\ProjectController::class, 'inquiry_set'])->name('admin.project_inquiry_set');
         Route::any('/get_process_records', [Aside\Project\ProjectController::class, 'get_process_records'])->name('admin.project_get_process_records');
         Route::any('/get_process_records', [Aside\Project\ProjectController::class, 'get_process_records'])->name('admin.project_get_process_records');
+        Route::any('/get_project_records', [Aside\Project\ProjectController::class, 'get_project_records'])->name('admin.project_get_project_records');
         Route::any('/save_process_records', [Aside\Project\ProjectController::class, 'save_process_records'])->name('admin.project_save_process_records');
         Route::any('/save_process_records', [Aside\Project\ProjectController::class, 'save_process_records'])->name('admin.project_save_process_records');
         Route::any('/get_contract_bill', [Aside\Project\ProjectController::class, 'get_contract_bill'])->name('admin.project_get_contract_bill');
         Route::any('/get_contract_bill', [Aside\Project\ProjectController::class, 'get_contract_bill'])->name('admin.project_get_contract_bill');
         Route::any('/data_source', [Aside\Project\ProjectController::class, 'data_source'])->name('admin.project_data_source.white');
         Route::any('/data_source', [Aside\Project\ProjectController::class, 'data_source'])->name('admin.project_data_source.white');