合并分支 'workorder' 到 'master'

V6 刷新 第一负责人’



查看合并请求 !2159

@@ -68,21 +68,23 @@ class FetchTicketProjects extends Command
                 # V5: 版本号+postid
                 # V5: 版本号+postid
                 $uuid = md5("V5{$item['postid']}");
                 $uuid = md5("V5{$item['postid']}");
                 $project = TicketProject::where('uuid', $uuid)->first();
                 $project = TicketProject::where('uuid', $uuid)->first();
-
-                $item['pm'] = $item['pm'] == '未安排' ? '杨长远' : $item['pm'];
-                $item['assm'] = $item['assm'] == '未安排' ? '杨长远' : $item['assm'];
-                $item['yhs'] = $item['yhs'] == '未安排' ? '杨长远' : $item['yhs'];
-
-                // 如果 $item['cate'] 包含”推广“字符，则$engineer_name = $item['assm']
-                $engineer_name = (strpos($item['cate'], '推广') !== false) ? $item['yhs'] : $item['assm'];
+                $assm_id = Manage::where('name', $item['assm'])->value('id') ?? Manage::where('name', '张鸿飞')->value('id') ?? 0;  //售后服务经理
+                $seom_id = Manage::where('name', $item['yhs'])->value('id') ?? Manage::where('name', '陶婵')->value('id') ?? 0;  //优化师
+                // 如果 $item['cate'] 包含”推广“字符，则 $engineer_name = $item['assm']
+                /**
+                 * 第一负责人逻即说明：
+                 * 优化推广项目：找售后服务经理??鸿飞
+                 * 建站类项目： 找杨长远
+                 */
+                $engineer_id = (strpos($item['cate'], '推广') !== false) ? $assm_id : Manage::where('name', '杨长远')->value('id') ?? 0;
 
 
                 $fields = [
                 $fields = [
                     'post_id'        => $item['postid'],
                     'post_id'        => $item['postid'],
                     'company_name'   => $item['company'],
                     'company_name'   => $item['company'],
                     'title'          => $item['title'],
                     'title'          => $item['title'],
-                    'engineer_id'   => Manage::where('name', $engineer_name)->value('id') ?? 0,  // 第一负责人
-                    'assm_id'   => Manage::where('name', $item['assm'])->value('id') ?? 0,  //售后服务经理
-                    'seom_id'   => Manage::where('name', $item['yhs'])->value('id') ?? 0,  //售后服务经理
+                    'engineer_id'   => $engineer_id,  // 第一负责人
+                    'assm_id'   => $assm_id,
+                    'seom_id'   => $seom_id,
                     'website'        => $item['main_url'] ?? '',
                     'website'        => $item['main_url'] ?? '',
                 ];
                 ];
                 if (!$project) {
                 if (!$project) {
@@ -132,14 +134,29 @@ class FetchTicketProjects extends Command
                 foreach ($items as $item) {
                 foreach ($items as $item) {
                     $uuid = md5("V5{$item->id}");
                     $uuid = md5("V5{$item->id}");
                     $project = TicketProject::where('uuid', $uuid)->first();
                     $project = TicketProject::where('uuid', $uuid)->first();
+                    // 售后服务经理
+                    $assm_id = $item->deploy_optimize->manager_mid ?? $item->deploy_optimize->tech_leader ?? Manage::where('name', '张鸿飞')->value('id') ?? 0;
+                    $seom_id = $item->deploy_optimize->optimist_mid ?? $assm_id;
+                    /**
+                     * 第一负责人逻辑
+                     * 建站类项目：找杨长远
+                     * 推广类：找售后
+                     */
+                    if (in_array($item->type, [Project::TYPE_TWO, Project::TYPE_FOUR, Project::TYPE_SIX])) {
+                        // 优化推广项目
+                        $engineer_id = $assm_id;
+                    }elseif ($item->type == Project::TYPE_THREE) {
+                        $engineer_id = Manage::where('name', '杨长远')->value('id') ?? 0; // 建站类项目找杨长远
+                    }else{
+                        $engineer_id = $item->deploy_build->manager_mid ?? $item->deploy_build->leader_mid ?? 0;
+                    }
+
                     $fields = [
                     $fields = [
                         'company_name'   => $item->company,
                         'company_name'   => $item->company,
                         'title'          => $item->title,
                         'title'          => $item->title,
-                        'assm_id' => $item->type ==3 ? $item->deploy_optimize->manager_mid ?? 0 : $item->deploy_build->manager_mid ?? 0, // 售后服务经理
-                        'seom_id' => $item->deploy_optimize->optimist_mid ?? $item->deploy_optimize->manager_mid ?? $item->deploy_optimize->tech_leader ?? 0, // 优化推广负责人
-                        'engineer_id' => $item->type == 3 ?
-                            $item->deploy_optimize->optimist_mid ?? $item->deploy_optimize->manager_mid ?? $item->deploy_optimize->tech_leader ?? 0
-                            : $item->deploy_build->manager_mid ?? $item->deploy_build->leader_mid ?? 0, // 技术组长
+                        'assm_id' => $assm_id,
+                        'seom_id' => $seom_id,
+                        'engineer_id' => $engineer_id
                     ];
                     ];
                     if (!$project) {
                     if (!$project) {
                         $project = new TicketProject();
                         $project = new TicketProject();