匹配公司

app/admin/controller/Couple.php

@@ -29,7 +29,7 @@ class Couple extends AdminBaseController
         }
 
         //初始化数据
-        $data     = ['id', 'name','company','level','street','mobile','people'];
+        $data     = ['id', 'name', 'company', 'level', 'street', 'mobile', 'people'];
         $old_list = import_exl($old_file, $data, 1);
         $new_list = import_exl($new_file, $data, 1);
         if (empty($old_list)) {
@@ -44,33 +44,36 @@ class Couple extends AdminBaseController
         $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);
+        $list       = array_intersect($new_idcard, $old_idcard);
 
         //旧名单重整
-        $old_people_by_mobile = [];
+        $old_people_by_mobile  = [];
+        $old_people_by_company = [];
         foreach ($old_list as $v) {
-            $old_people_by_mobile[$v['mobile']] = $v['people'];
+            $old_people_by_mobile[$v['mobile']]   = $v['people'];
+            $old_people_by_company[$v['company']] = $v['people'];
         }
 
         //匹配名单
         $res = [];
         foreach ($delete as $k => $v) {
-            $item = $old_list[$k];
+            $item           = $old_list[$k];
             $item['status'] = '过期';
-            $res[] = $item;
+            $res[]          = $item;
         }
 
         foreach ($add as $k => $v) {
-            $item = $new_list[$k];
+            $item           = $new_list[$k];
             $item['status'] = '新增';
-            $res[] = $item;
+            $item['people'] = $old_people_by_company[$v['company']] ?? '';
+            $res[]          = $item;
         }
 
         foreach ($list as $k => $v) {
-            $item = $new_list[$k];
+            $item           = $new_list[$k];
             $item['status'] = '续期';
             $item['people'] = $old_people_by_mobile[$v];
-            $res[] = $item;
+            $res[]          = $item;
         }
 
         $xlsCell = [

app/admin/view/company/info.html

@@ -233,12 +233,12 @@
                                 <tr>
                                     <td colspan="2" onclick="copyMobileUrl('https://110.88.129.62:8443');">IP：https://110.88.129.62:8443</td>
                                     <td onclick="copyMobileUrl('jjrencai');">用户名：jjrencai</td>
-                                    <td onclick="copyMobileUrl('MGK@c#svu6G2');">密码：MGK@c#svu6G2</td>
+                                    <td onclick="copyMobileUrl('dwPtJLPhQd#E%2AB');">密码：dwPtJLPhQd#E%2AB</td>
                                 </tr>
                                 <tr>
                                     <td onclick="copyMobileUrl('https://172.21.134.92');">网址：https://172.21.134.92</td>
                                     <td onclick="copyMobileUrl('jjrencai');">用户名：jjrencai</td>
-                                    <td onclick="copyMobileUrl('fGfCjb^jCH!J');">密码：fGfCjb^jCH!J</td>
+                                    <td onclick="copyMobileUrl('iow&kC5GCL11jPSS');">密码：iow&kC5GCL11jPSS</td>
                                     <td onclick="copyMobileUrl('D:\\install\\Navicat Premium 15\\navicat.exe');">navicate：D:\install\Navicat Premium 15\navicat.exe</td>
                                 </tr>
                             </tbody>
@@ -253,7 +253,7 @@
                                 <tr>
                                     <td>服务器</td>
                                     <td onclick="copyMobileUrl('zmw');">用户名：zmw</td>
-                                    <td onclick="copyMobileUrl('!QAZ3edc@WSX');">密码：!QAZ3edc@WSX</td>
+                                    <td onclick="copyMobileUrl('!QAZ3edc@WSX');">密码：LpQ3(p^4)5odnJSy</td>
                                 </tr>
                                 <tr>
                                     <td>数据库</td>