周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 f7969069e9fadae11835fcf2b57e823762be88d6 2 个父辈 a254d599 d862dd8a

Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 3 行删除
@@ -86,7 +86,7 @@ class MonthAllCount extends Command @@ -86,7 +86,7 @@ class MonthAllCount extends Command
86 $end = date('Y-m-t', strtotime($v['month'])); 86 $end = date('Y-m-t', strtotime($v['month']));
87 $arr['project_id'] = $project_id; 87 $arr['project_id'] = $project_id;
88 $res = $this->inquiry($url,$v['month']); 88 $res = $this->inquiry($url,$v['month']);
89 - 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'];
@@ -109,7 +109,7 @@ class MonthCount extends Command @@ -109,7 +109,7 @@ class MonthCount extends Command
109 $end = date('Y-m-t', strtotime($v['month'])); 109 $end = date('Y-m-t', strtotime($v['month']));
110 $arr['project_id'] = $project_id; 110 $arr['project_id'] = $project_id;
111 $res = $this->inquiry($url,$v['month']); 111 $res = $this->inquiry($url,$v['month']);
112 -// $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'];
@@ -75,7 +75,7 @@ class MonthProjectCount extends Command @@ -75,7 +75,7 @@ class MonthProjectCount extends Command
75 $end = date('Y-m-t', strtotime($v['month'])); 75 $end = date('Y-m-t', strtotime($v['month']));
76 $arr['project_id'] = $project_id; 76 $arr['project_id'] = $project_id;
77 $res = $this->inquiry($url,$v['month']); 77 $res = $this->inquiry($url,$v['month']);
78 -// $arr['month_total'] = 0; 78 + $arr['total'] = $arr['month_total'] = 0;
79 if(isset($res['data']['count'])){ 79 if(isset($res['data']['count'])){
80 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL; 80 echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
81 $arr['month_total'] = $res['data']['count']; 81 $arr['month_total'] = $res['data']['count'];