linwu 2 tahun lalu
induk
melakukan
fd1b3a6e0f
2 mengubah file dengan 380 tambahan dan 375 penghapusan
  1. 8 6
      app/admin/controller/Comjobs.php
  2. 372 369
      app/admin/controller/User.php

+ 8 - 6
app/admin/controller/Comjobs.php

@@ -17,7 +17,6 @@ use app\common\service\RensheService;
 use app\common\validate\Comjobs as ComjobsValidate;
 use think\exception\ValidateException;
 use think\facade\Db;
-use think\facade\Log;
 
 class Comjobs extends BaseController
 {
@@ -529,7 +528,7 @@ class Comjobs extends BaseController
     {
         $data       = ['cate', 'title', 'type', 'zwagall', 'community', 'province', 'city', 'district', 'education', 'agegroup', 'tags', 'comdetails', 'requirement',
                        'worker', 'telephone', 'name', 'address', 'time', 'emp_time', 'is_worry'];
-        $list       = importExecl('21.xlsx', $data, 2);
+        $list       = importExecl('2.xlsx', $data, 1);
         $data       = [];
         $wtype      = ['按月' => 1, '按时' => 2, '按件' => 3, '按项目' => 4, '面议' => 5];
         $rensheCode = RensheCode::select();
@@ -538,7 +537,7 @@ class Comjobs extends BaseController
             $renshe[$v['type']][$v['name']] = $v['code'];
         }
         $cateList = ComjobsCateModel::column('id', 'title');
-
+        
         foreach ($list as $v) {
             if (empty($v['cate'])) {
                 continue;
@@ -547,10 +546,12 @@ class Comjobs extends BaseController
             if (empty($cateList[$v['cate']])) {
                 halt($cateList, $v);
             }
+            $third = WorkerThird::create(['name'=>$v['worker'],'contact'=>$v['name']]);
+            $item['third_id'] = $third['id'];
             $item['cateid']  = $cateList[$v['cate']];
             $item['title']   = $v['title'];
             $item['wtype']   = $wtype[$v['type']];
-            $item['zwagall'] = $v['zwagall'];
+            $item['zwagall'] = $item['bwagall'] = $v['zwagall'];
             if (!empty($renshe['community'][$v['community']])) {
                 $item['community'] = $renshe['community'][$v['community']];
             }
@@ -568,8 +569,8 @@ class Comjobs extends BaseController
                 $tags = [];
             }
             $item['tags']        = $tags;
-            $item['comdetails']  = $v['comdetails'];
-            $item['requirement'] = $v['requirement'];
+            $item['comdetails']  = (string)$v['comdetails'];
+            $item['requirement'] = (string)$v['requirement'];
             $item['workerid']    = 8;
             $item['telephone']   = (string)$v['telephone'];
             $item['address']     = (string)$v['address'];
@@ -581,6 +582,7 @@ class Comjobs extends BaseController
             $item['is_worry']   = $v['is_worry'] ? $v['is_worry'] : 0;
             $item['priority']   = 0;
             $item['status']     = 3;
+            $item['enddate']     = 1664553599;
             $item['createtime'] = $item['updatetime'] = time();
             $data[]             = $item;
         }

File diff ditekan karena terlalu besar
+ 372 - 369
app/admin/controller/User.php


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini