|
|
@ -44,7 +44,7 @@ class CompanySystemRatioController extends AdminController
|
|
|
|
$handleData = $this->getCpGameRatio($handleData);
|
|
|
|
$handleData = $this->getCpGameRatio($handleData);
|
|
|
|
$data = $this->handleRatio($handleData);
|
|
|
|
$data = $this->handleRatio($handleData);
|
|
|
|
|
|
|
|
|
|
|
|
// dump($handleData);die();
|
|
|
|
// dump($data);die();
|
|
|
|
|
|
|
|
|
|
|
|
$gameData = M("game","tab_")->field("original_package_name,relation_game_name game_name,game_type_name,relation_game_id game_id")
|
|
|
|
$gameData = M("game","tab_")->field("original_package_name,relation_game_name game_name,game_type_name,relation_game_id game_id")
|
|
|
|
->where($map)
|
|
|
|
->where($map)
|
|
|
@ -202,8 +202,8 @@ class CompanySystemRatioController extends AdminController
|
|
|
|
if ($finalData[$key][$v['turnover']]["instanceof"] != $v["instanceof"]) {
|
|
|
|
if ($finalData[$key][$v['turnover']]["instanceof"] != $v["instanceof"]) {
|
|
|
|
$finalData[$key][$v['turnover']]["instanceof"] = 0;
|
|
|
|
$finalData[$key][$v['turnover']]["instanceof"] = 0;
|
|
|
|
|
|
|
|
|
|
|
|
$finalData[$key][$v['turnover']."eq"] = $finalData[$key][$v['turnover']];
|
|
|
|
$finalData[$key][$v['turnover']."ed"] = $finalData[$key][$v['turnover']];
|
|
|
|
$finalData[$key][$v['turnover']."eq"]['is_equal'] = 1;
|
|
|
|
$finalData[$key][$v['turnover']."ed"]['is_equal'] = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
@ -217,7 +217,14 @@ class CompanySystemRatioController extends AdminController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach ($finalData as $key => $value) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$last_names = array_column($finalData[$key],'turnover');
|
|
|
|
|
|
|
|
array_multisort($last_names,SORT_ASC,$finalData[$key]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// dump($finalData);
|
|
|
|
$data = [];
|
|
|
|
$data = [];
|
|
|
|
foreach ($finalData as $key => $value) {
|
|
|
|
foreach ($finalData as $key => $value) {
|
|
|
|
|
|
|
|
|
|
|
@ -240,13 +247,14 @@ class CompanySystemRatioController extends AdminController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// dump($data);die();
|
|
|
|
|
|
|
|
|
|
|
|
foreach ($data as $key => $value) {
|
|
|
|
// foreach ($data as $key => $value) {
|
|
|
|
|
|
|
|
//
|
|
|
|
$last_names = array_column($data[$key],'turnover');
|
|
|
|
// $last_names = array_column($data[$key],'turnover');
|
|
|
|
array_multisort($last_names,SORT_ASC,$data[$key]);
|
|
|
|
// array_multisort($last_names,SORT_ASC,$data[$key]);
|
|
|
|
|
|
|
|
//
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
// dump($data);
|
|
|
|
// dump($data);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|