修改

app/Service/BIService.php

@@ -44,16 +44,23 @@ class BIService extends Service
 
     public function homePageData($data, $user)
     {
-        $model = Item::TopClear($user,$data);
-        $start_time = $model->where('del_time',0)
-            ->orderby('id', 'desc')->value("start_time");
-        $year =  date('Y-01-01',$start_time);
+        // mark 存在需求冲突 如果补录的项目 比如 2015年 那么一开始展示的年份就是2015 和2026年6月10号需求冲突
+        // 先注释原逻辑 换新
+//        $model = Item::TopClear($user,$data);
+//        $start_time = $model->where('del_time',0)
+//            ->orderby('id', 'desc')->value("start_time");
+        if(isset($data['year'])){
+            $start_time = strtotime($data['year']. '-01-01');
+        }else{
+            $start_time = time();
+        }
+        $year =  date('Y-01-01', $start_time);
         $data['month_start'] = $year;
-//        $data['month_start'] = "2024-01-01";
         list($status, $month_start, $month_end) = $this->commonRule($data);
         if (!$status) return [false, $month_start];
 
         //当年项目总数
+        $model = Item::TopClear($user,$data);
         $intersectCount = $model->where('start_time', '<=', $month_end)   // 项目开始时间 <= 区间结束时间
             ->where('end_time', '>=', $month_start)   // 项目结束时间 >= 区间开始时间
             ->count();
@@ -132,7 +139,8 @@ class BIService extends Service
             'rd_rate' => $rd_rate, // 研发费用报销占比
             'man_work' => $man_work, //项目人员工时汇总
             'year' => date('Y',strtotime($year)),
-            'item_num' => $intersectCount
+            'item_num' => $intersectCount,
+            'start_year' => date('Y',time())
         ]];
     }