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

@@ -229,27 +229,27 @@ class FetchTicketProjects extends Command
                         ManageHr::where('status', 1)->find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
                         ManageHr::where('status', 1)->find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
                         8,  //张鸿飞
                         8,  //张鸿飞
                     ])->first(fn($v) => $v !== null && $v !== 0, 0);
                     ])->first(fn($v) => $v !== null && $v !== 0, 0);
-
                     // 优化师
                     // 优化师
                     $seom_id = ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid) ? ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid)->manage_id : 0;
                     $seom_id = ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid) ? ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid)->manage_id : 0;
-
                     // 项目经理
                     // 项目经理
                     $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
                     $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
 
 
                     // 第一负责人
                     // 第一负责人
-                    /**
-                     * 5.0升级6.0的项目,白帽SEO, GEO的项目 都划给售后
-                     * 其他：建站中找项目经理，建站完成找杨长远，推广找售后服务经理
+                    /**单纯的5.0升级6.0的项目,自帽SE0，GE0的项目 部划给售后
+                    其他:建站中找项目经理，建站完成找杨长远，推广找售后服务经理
                      */
                      */
-                    if ($item->is_upgrade || $item->project_type == 1 || $item->deploy_build->seo_plan > 0)
+                    //todo::建站或同时为v6版本+GEO的，建站中项目给项目经理
+                    if(($status == 1) && ($item->deploy_build->plan > 0) && ($item->deploy_build->seo_plan > 0)){
+                        $engineer_id = $pm_id; //找项目经理
+                    }elseif (($item->is_upgrade == 1) || ($item->project_type == 1)){
                         $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
                         $engineer_id = $assm_id; // V5升V6，白帽SEO，GEO,找售后服务经理
-                    elseif ($status == 1)
+                    }elseif ($status == 1){
                         $engineer_id = $pm_id; // 建站中找项目经理
                         $engineer_id = $pm_id; // 建站中找项目经理
-                    elseif ($status == 2)
+                    }elseif ($status == 2){
                         $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                         $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
-                    else
+                    }else{
                         $engineer_id = $assm_id; // 推广找售后服务经理
                         $engineer_id = $assm_id; // 推广找售后服务经理
-
+                    }
                     $is_del = (
                     $is_del = (
                         $item->extend_type == 5
                         $item->extend_type == 5
                         || $item->type == 8
                         || $item->type == 8

@@ -27,9 +27,11 @@ class ProcessRecordsLogic extends BaseLogic
                 'record' => [],
                 'record' => [],
                 'remark' => '',
                 'remark' => '',
                 'project_record'=>0,
                 'project_record'=>0,
-                'optimize_record'=>0
+                'optimize_record'=>0,
+                'type'=>$project['type']
             ];
             ];
         }
         }
+        $data['type'] = $project['type'] ?? '';
         $data['project_company'] = $project['company'] ?? '';
         $data['project_company'] = $project['company'] ?? '';
         $plan = Project::planMap();
         $plan = Project::planMap();
         $seo_plan = Project::seoMap();
         $seo_plan = Project::seoMap();