|
|
@@ -39,12 +39,20 @@ class Couple extends AdminBaseController
|
|
|
return '新名单文件无数据';
|
|
|
}
|
|
|
|
|
|
+ //数据处理
|
|
|
$old_idcard = array_column($old_list, 'mobile');
|
|
|
$new_idcard = array_column($new_list, 'mobile');
|
|
|
$delete = array_diff($old_idcard, $new_idcard);
|
|
|
$add = array_diff($new_idcard, $old_idcard);
|
|
|
$list = array_intersect($new_idcard,$old_idcard);
|
|
|
|
|
|
+ //旧名单重整
|
|
|
+ $old_people_by_mobile = [];
|
|
|
+ foreach ($old_list as $v) {
|
|
|
+ $old_people_by_mobile[$v['mobile']] = $v['people'];
|
|
|
+ }
|
|
|
+
|
|
|
+ //匹配名单
|
|
|
$res = [];
|
|
|
foreach ($delete as $k => $v) {
|
|
|
$item = $old_list[$k];
|
|
|
@@ -61,6 +69,7 @@ class Couple extends AdminBaseController
|
|
|
foreach ($list as $k => $v) {
|
|
|
$item = $new_list[$k];
|
|
|
$item['status'] = '续期';
|
|
|
+ $item['people'] = $old_people_by_mobile[$v['mobile']];
|
|
|
$res[] = $item;
|
|
|
}
|
|
|
|
