周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 3533065290b8a66602944c73249228e8f2dfa5a1 1 个父辈 0927b0e4

gxdemo脚本

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 14 行删除
@@ -89,18 +89,16 @@ class MonthAllCount extends Command @@ -89,18 +89,16 @@ class MonthAllCount extends Command
89 $arr['total'] = $arr['month_total'] = 0; 89 $arr['total'] = $arr['month_total'] = 0;
90 if(isset($res['data']['count'])){ 90 if(isset($res['data']['count'])){
91 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL; 91 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
92 - $arr['month_total'] = $res['data']['count']; 92 + $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
  93 + }
93 //获取上一个的count 94 //获取上一个的count
94 $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month')); 95 $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
95 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]); 96 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
96 if($previousInfo === false){ 97 if($previousInfo === false){
97 $arr['total'] = $arr['month_total']; 98 $arr['total'] = $arr['month_total'];
98 }else{ 99 }else{
99 - $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);  
100 - } 100 + $arr['total'] = $arr['month_total'] + ($previousInfo['total'] ?? 0);
101 } 101 }
102 - //获取当月的其他询盘  
103 - $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);  
104 $country = []; 102 $country = [];
105 if(isset($res['data']['data'])){ 103 if(isset($res['data']['data'])){
106 $country = $res['data']['data']; 104 $country = $res['data']['data'];
@@ -112,18 +112,16 @@ class MonthCount extends Command @@ -112,18 +112,16 @@ class MonthCount extends Command
112 $arr['total'] = $arr['month_total'] = 0; 112 $arr['total'] = $arr['month_total'] = 0;
113 if(isset($res['data']['count'])){ 113 if(isset($res['data']['count'])){
114 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL; 114 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
115 - $arr['month_total'] = $res['data']['count']; 115 + $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
  116 + }
116 //获取上一个的count 117 //获取上一个的count
117 $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month')); 118 $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
118 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]); 119 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
119 if($previousInfo === false){ 120 if($previousInfo === false){
120 $arr['total'] = $arr['month_total']; 121 $arr['total'] = $arr['month_total'];
121 }else{ 122 }else{
122 - $arr['total'] = $res['data']['count'] + ($previousInfo['total'] ?? 0);  
123 - } 123 + $arr['total'] = $arr['month_total'] + ($previousInfo['total'] ?? 0);
124 } 124 }
125 - //获取当月的其他询盘  
126 - $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);  
127 $country = []; 125 $country = [];
128 if(isset($res['data']['data'])){ 126 if(isset($res['data']['data'])){
129 $country = $res['data']['data']; 127 $country = $res['data']['data'];
@@ -145,7 +143,6 @@ class MonthCount extends Command @@ -145,7 +143,6 @@ class MonthCount extends Command
145 $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month")); 143 $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month"));
146 $arr['created_at'] = $firstDayOfNextMonth; 144 $arr['created_at'] = $firstDayOfNextMonth;
147 $arr['updated_at'] = $firstDayOfNextMonth; 145 $arr['updated_at'] = $firstDayOfNextMonth;
148 -// echo date('Y-m-d H:i:s') . '数据：'.json_encode($arr) . PHP_EOL;  
149 $monthCountModel->insert($arr); 146 $monthCountModel->insert($arr);
150 }else{ 147 }else{
151 $monthCountModel->edit($arr,['id'=>$info['id']]); 148 $monthCountModel->edit($arr,['id'=>$info['id']]);
@@ -86,6 +86,7 @@ class MonthProjectCount extends Command @@ -86,6 +86,7 @@ class MonthProjectCount extends Command
86 if(isset($res['data']['count'])){ 86 if(isset($res['data']['count'])){
87 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL; 87 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
88 $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']); 88 $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
  89 + }
89 //获取上一个的count 90 //获取上一个的count
90 $previousMonth = date('Y-m', strtotime($v . ' -1 month')); 91 $previousMonth = date('Y-m', strtotime($v . ' -1 month'));
91 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]); 92 $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
@@ -94,9 +95,6 @@ class MonthProjectCount extends Command @@ -94,9 +95,6 @@ class MonthProjectCount extends Command
94 }else{ 95 }else{
95 $arr['total'] = $arr['month_total'] + ($previousInfo['total'] ?? 0); 96 $arr['total'] = $arr['month_total'] + ($previousInfo['total'] ?? 0);
96 } 97 }
97 - }  
98 - //获取当月的其他询盘  
99 -// $arr['total'] += InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);  
100 echo date('Y-m-d H:i:s') . '加上其他询盘：'.$arr['total'] . PHP_EOL; 98 echo date('Y-m-d H:i:s') . '加上其他询盘：'.$arr['total'] . PHP_EOL;
101 $country = []; 99 $country = [];
102 if(isset($res['data']['data'])){ 100 if(isset($res['data']['data'])){