|
@@ -598,9 +598,30 @@ class ApiController extends BaseController
|
|
->where('t.delete_type',0)
|
|
->where('t.delete_type',0)
|
|
->get();
|
|
->get();
|
|
|
|
|
|
-
|
|
|
|
|
|
+ // 数据库查出来的数据进行处理
|
|
|
|
+ $process_data = [];
|
|
// 1. 提取所有单位id值
|
|
// 1. 提取所有单位id值
|
|
- $tmp = array_column($evaluate_data, 'unitId');
|
|
|
|
|
|
+ $tmp = [];
|
|
|
|
+ $index = 0;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(count($evaluate_data) > 0){
|
|
|
|
+ for ($i = 0; $i < count($evaluate_data); $i++) {
|
|
|
|
+ $process_data[$index]['unitId'] = $evaluate_data[$i]->unitId;
|
|
|
|
+ $process_data[$index]['sgyy'] = $evaluate_data[$i]->sgyy;
|
|
|
|
+ $process_data[$index]['sghg'] = $evaluate_data[$i]->sghg;
|
|
|
|
+ $process_data[$index]['sgcljg'] = $evaluate_data[$i]->sgcljg;
|
|
|
|
+ $process_data[$index]['xqjxjffcs'] = $evaluate_data[$i]->xqjxjffcs;
|
|
|
|
+ $process_data[$index]['df'] = $evaluate_data[$i]->df;
|
|
|
|
+ $process_data[$index]['dwmc'] = $evaluate_data[$i]->dwmc;
|
|
|
|
+ $index++;
|
|
|
|
+
|
|
|
|
+ $tmp[] = $evaluate_data[$i]->unitId;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
// 2. 去重并重置索引
|
|
// 2. 去重并重置索引
|
|
$unitId_List = array_values(array_unique($tmp));
|
|
$unitId_List = array_values(array_unique($tmp));
|
|
|
|
|
|
@@ -610,7 +631,6 @@ class ApiController extends BaseController
|
|
$unitId = $item['unitId'];
|
|
$unitId = $item['unitId'];
|
|
$grouped[$unitId][] = $item; // 按unitId值分组
|
|
$grouped[$unitId][] = $item; // 按unitId值分组
|
|
}
|
|
}
|
|
- $var1 = [];
|
|
|
|
$result = [];
|
|
$result = [];
|
|
foreach ($unitId_List as $unitIdVar) {
|
|
foreach ($unitId_List as $unitIdVar) {
|
|
if (isset($grouped[$unitIdVar])) {
|
|
if (isset($grouped[$unitIdVar])) {
|