gxdemo脚本

@@ -98,6 +98,15 @@ class MonthAllCount extends Command
                 }else{
                     $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
                 }
+            }else{
+                //获取上一个的count
+                $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+                $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+                if($previousInfo === false){
+                    $arr['total'] = $arr['month_total'];
+                }else{
+                    $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
+                }
             }
             //获取当月的其他询盘
             $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);

@@ -121,6 +121,15 @@ class MonthCount extends Command
             }else{
                 $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
             }
+        }else{
+            //获取上一个的count
+            $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+            $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+            if($previousInfo === false){
+                $arr['total'] = $arr['month_total'];
+            }else{
+                $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
+            }
         }
         //获取当月的其他询盘
         $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);

@@ -87,6 +87,15 @@ class MonthProjectCount extends Command
                 }else{
                     $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
                 }
+            }else{
+                //获取上一个的count
+                $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+                $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+                if($previousInfo === false){
+                    $arr['total'] = $arr['month_total'];
+                }else{
+                    $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);
+                }
             }
             //获取当月的其他询盘
             $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);