周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 2491ae32a27fb705f9557fe37fadd6da93c75caa 2 个父辈 83823697 6e7a948e

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

Lyh server



查看合并请求 !1960
内嵌 并排对比
正在显示 3 个修改的文件 包含 45 行增加 和 40 行删除
@@ -61,15 +61,16 @@ class AfterDayCount extends Command @@ -61,15 +61,16 @@ class AfterDayCount extends Command
61 $this->managerHrModel = new ManageHr(); 61 $this->managerHrModel = new ManageHr();
62 $projectModel = new Project(); 62 $projectModel = new Project();
63 $rankDataLogModel = new RankDataLog(); 63 $rankDataLogModel = new RankDataLog();
64 - $todayMidnight = date('Y-m-d', strtotime('today')); 64 + $date = date('Y-m-d');
65 $saveData = []; 65 $saveData = [];
66 - $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id 66 +// $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
67 foreach ($this->after_manager as $key => $valM){ 67 foreach ($this->after_manager as $key => $valM){
68 $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id'); 68 $idArr = $this->managerHrModel->selectField(['name'=>['in',$valM]],'id');
  69 + echo '对应优化师id：'.json_encode($idArr).PHP_EOL;
69 $project_count = $projectModel->where('gl_project.extend_type',0) 70 $project_count = $projectModel->where('gl_project.extend_type',0)
70 ->where('gl_project.delete_status',0) 71 ->where('gl_project.delete_status',0)
71 ->where('gl_project.old_project_id',0) 72 ->where('gl_project.old_project_id',0)
72 - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) 73 + ->where('gl_project_deploy_optimize.start_date','<=',$date)
73 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 74 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
74 ->whereIn('gl_project.type',[2,4,6]) 75 ->whereIn('gl_project.type',[2,4,6])
75 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 76 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
@@ -79,7 +80,7 @@ class AfterDayCount extends Command @@ -79,7 +80,7 @@ class AfterDayCount extends Command
79 $qualified_count = $projectModel->where('gl_project.extend_type',0) 80 $qualified_count = $projectModel->where('gl_project.extend_type',0)
80 ->where('gl_project.delete_status',0) 81 ->where('gl_project.delete_status',0)
81 ->where('gl_project.old_project_id',0) 82 ->where('gl_project.old_project_id',0)
82 - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) 83 + ->where('gl_project_deploy_optimize.start_date','<=',$date)
83 ->where('gl_project.is_remain_today',1) 84 ->where('gl_project.is_remain_today',1)
84 ->where('gl_project_deploy_build.plan','!=',0) 85 ->where('gl_project_deploy_build.plan','!=',0)
85 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 86 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
@@ -91,6 +92,7 @@ class AfterDayCount extends Command @@ -91,6 +92,7 @@ class AfterDayCount extends Command
91 ->count(); 92 ->count();
92 $rate = number_format($qualified_count / $project_count, 2); 93 $rate = number_format($qualified_count / $project_count, 2);
93 $threeMonthsAgo = date('Y-m', strtotime('-3 months')); 94 $threeMonthsAgo = date('Y-m', strtotime('-3 months'));
  95 + echo '3个月前的时间：'.$threeMonthsAgo.PHP_EOL;
94 $three_project_count = $projectModel->where('gl_project.extend_type',0) 96 $three_project_count = $projectModel->where('gl_project.extend_type',0)
95 ->where('gl_project.delete_status',0) 97 ->where('gl_project.delete_status',0)
96 ->where('gl_project.old_project_id',0) 98 ->where('gl_project.old_project_id',0)
@@ -103,9 +105,9 @@ class AfterDayCount extends Command @@ -103,9 +105,9 @@ class AfterDayCount extends Command
103 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 105 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
104 ->count(); 106 ->count();
105 $three_qualified_count = $projectModel->where('gl_project.extend_type',0) 107 $three_qualified_count = $projectModel->where('gl_project.extend_type',0)
106 - ->whereIn('gl_project.id',$projectIdArr)  
107 ->where('gl_project.delete_status',0) 108 ->where('gl_project.delete_status',0)
108 ->where('gl_project.old_project_id',0) 109 ->where('gl_project.old_project_id',0)
  110 + ->where('gl_project.is_remain_today',1)
109 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01') 111 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
110 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31') 112 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
111 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 113 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
@@ -123,7 +125,7 @@ class AfterDayCount extends Command @@ -123,7 +125,7 @@ class AfterDayCount extends Command
123 } 125 }
124 $data = $projectModel->where('gl_project.extend_type',0) 126 $data = $projectModel->where('gl_project.extend_type',0)
125 ->where('gl_project.delete_status',0) 127 ->where('gl_project.delete_status',0)
126 - ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight) 128 + ->where('gl_project_deploy_optimize.start_date','<=',$date)
127 ->where('gl_project.is_remain_today',1) 129 ->where('gl_project.is_remain_today',1)
128 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 130 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
129 ->whereIn('gl_project.type',[2,4,6]) 131 ->whereIn('gl_project.type',[2,4,6])
@@ -132,7 +134,7 @@ class AfterDayCount extends Command @@ -132,7 +134,7 @@ class AfterDayCount extends Command
132 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 134 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
133 ->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray(); 135 ->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray();
134 $saveData[] = [ 136 $saveData[] = [
135 - 'date'=>date('Y-m-d', strtotime('yesterday')), 137 + 'date'=>date('Y-m-d'),
136 'type'=> $key, 138 'type'=> $key,
137 'project_count'=>$project_count, 139 'project_count'=>$project_count,
138 'qualified_count'=>$qualified_count, 140 'qualified_count'=>$qualified_count,
@@ -52,9 +52,9 @@ class LyhImportTest extends Command @@ -52,9 +52,9 @@ class LyhImportTest extends Command
52 * @time :2023/11/20 15:13 52 * @time :2023/11/20 15:13
53 */ 53 */
54 public function handle(){ 54 public function handle(){
55 - ProjectServer::useProject(2140); 55 + ProjectServer::useProject(3494);
56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
57 - $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/all-202557.csv',2140); 57 + $this->importCustomModule('https://ecdn6.globalso.com/upload/p/3494/file/2025-05/faq-1.csv',3494);
58 DB::disconnect('custom_mysql'); 58 DB::disconnect('custom_mysql');
59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 59 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
60 } 60 }
@@ -356,21 +356,21 @@ class LyhImportTest extends Command @@ -356,21 +356,21 @@ class LyhImportTest extends Command
356 foreach ($line_of_text as $k => $item){ 356 foreach ($line_of_text as $k => $item){
357 // try { 357 // try {
358 //添加内容 358 //添加内容
359 - $contentId = $customContentModel->addReturnId(['name'=>$item[0],'module_id'=>2,'project_id'=>$project_id]); 359 + $contentId = $customContentModel->addReturnId(['name'=>$item[0],'module_id'=>3,'remark'=>$item[1],'project_id'=>$project_id]);
360 echo date('Y-m-d H:i:s') . '当前扩展数据id:'. $contentId . PHP_EOL; 360 echo date('Y-m-d H:i:s') . '当前扩展数据id:'. $contentId . PHP_EOL;
361 //注册路由 361 //注册路由
362 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE, 362 $route = RouteMap::setRoute($item[0], RouteMap::SOURCE_MODULE,
363 $contentId, $project_id); 363 $contentId, $project_id);
364 $customContentModel->edit(['route'=>$route],['id'=>$contentId]); 364 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
365 - if(!empty($item[1])){ 365 + if(!empty($item[3])){
366 $categoryId = ','; 366 $categoryId = ',';
367 - $cateArr = explode('/',$item[1]); 367 + $cateArr = explode('/',$item[3]);
368 foreach ($cateArr as $cateV){ 368 foreach ($cateArr as $cateV){
369 - $cateInfo = $customCategoryModel->read(['name'=>$cateV,'module_id'=>2,'project_id'=>$project_id]); 369 + $cateInfo = $customCategoryModel->read(['name'=>$cateV,'module_id'=>3,'project_id'=>$project_id]);
370 if($cateInfo !== false){ 370 if($cateInfo !== false){
371 $categoryId .= $cateInfo['id'].','; 371 $categoryId .= $cateInfo['id'].',';
372 }else{ 372 }else{
373 - $cateVId = $customCategoryModel->addReturnId(['name'=>$cateV,'module_id'=>2,'project_id'=>$project_id]); 373 + $cateVId = $customCategoryModel->addReturnId(['name'=>$cateV,'module_id'=>3,'project_id'=>$project_id]);
374 $cateRoute = RouteMap::setRoute($cateV, RouteMap::SOURCE_MODULE_CATE, 374 $cateRoute = RouteMap::setRoute($cateV, RouteMap::SOURCE_MODULE_CATE,
375 $cateVId, $project_id); 375 $cateVId, $project_id);
376 $customCategoryModel->edit(['route'=>$cateRoute],['id'=>$cateVId]); 376 $customCategoryModel->edit(['route'=>$cateRoute],['id'=>$cateVId]);
@@ -380,19 +380,19 @@ class LyhImportTest extends Command @@ -380,19 +380,19 @@ class LyhImportTest extends Command
380 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]); 380 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]);
381 } 381 }
382 $saveData = [ 382 $saveData = [
383 - ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[2], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
384 - ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
385 - ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
386 - ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[3], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
387 - ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[8], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
388 - ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
389 - ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
390 - ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
391 - ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
392 - ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
393 - ['key'=>'pd_extended_field_11', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
394 - ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
395 - ['key'=>'pd_extended_field_13', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 383 + ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[2], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>3, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  384 +// ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  385 +// ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  386 +// ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[3], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  387 +// ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[8], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  388 +// ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  389 +// ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  390 +// ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  391 +// ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  392 +// ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  393 +// ['key'=>'pd_extended_field_11', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  394 +// ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  395 +// ['key'=>'pd_extended_field_13', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>2, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
396 ]; 396 ];
397 $customExtendContentTModel->insert($saveData); 397 $customExtendContentTModel->insert($saveData);
398 // }catch (\Exception $e){ 398 // }catch (\Exception $e){
@@ -471,7 +471,7 @@ class LyhImportTest extends Command @@ -471,7 +471,7 @@ class LyhImportTest extends Command
471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]); 471 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
472 if(!empty($item[3])){ 472 if(!empty($item[3])){
473 $categoryId = ','; 473 $categoryId = ',';
474 - $cateArr = explode('/',$item[3]); 474 + $cateArr = explode('/',$item[1]);
475 foreach ($cateArr as $cateV){ 475 foreach ($cateArr as $cateV){
476 $cateInfo = $customCategoryModel->read(['name'=>$cateV,'module_id'=>7,'project_id'=>$project_id]); 476 $cateInfo = $customCategoryModel->read(['name'=>$cateV,'module_id'=>7,'project_id'=>$project_id]);
477 if($cateInfo !== false){ 477 if($cateInfo !== false){
@@ -487,19 +487,22 @@ class LyhImportTest extends Command @@ -487,19 +487,22 @@ class LyhImportTest extends Command
487 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]); 487 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]);
488 } 488 }
489 $saveData = [ 489 $saveData = [
490 - ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 490 + ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[3], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 491 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
492 - ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[8], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
493 - ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
494 - ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
495 - ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[7]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
496 - ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
497 - ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
498 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 492 ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
499 - ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[1], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
500 - ['key'=>'pd_extended_field_11', 'type'=>1, 'values'=>$item[0], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
501 - ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[11] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],  
502 - ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[14], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')], 493 + ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  494 + ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  495 + ['key'=>'pd_extended_field_16', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  496 + ['key'=>'pd_extended_field_15', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  497 + ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  498 + ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  499 + ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  500 + ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  501 + ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  502 + ['key'=>'pd_extended_field_21', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  503 + ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  504 + ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
  505 + ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
503 ]; 506 ];
504 $customExtendContentTModel->insert($saveData); 507 $customExtendContentTModel->insert($saveData);
505 // }catch (\Exception $e){ 508 // }catch (\Exception $e){
@@ -31,7 +31,7 @@ class BTemplateModuleProjectLogic extends BaseLogic @@ -31,7 +31,7 @@ class BTemplateModuleProjectLogic extends BaseLogic
31 */ 31 */
32 public function ModuleList($map,$order = 'created_at',$filed = ['id','name','status','image','html','project_id']){ 32 public function ModuleList($map,$order = 'created_at',$filed = ['id','name','status','image','html','project_id']){
33 $map['deleted_status'] = 0; 33 $map['deleted_status'] = 0;
34 - $list = $this->model::whereRaw("FIND_IN_SET(?, project_id)", [$this->user['project_id']])->get()->toArray(); 34 + $list = $this->model::whereRaw("FIND_IN_SET(?, project_id)", [$this->user['project_id']])->orderBy($order,'desc')->select($filed)->get()->toArray();
35 $templateLabel = new TemplateLabel(); 35 $templateLabel = new TemplateLabel();
36 $label = []; 36 $label = [];
37 foreach ($list as $v){ 37 foreach ($list as $v){