Merge remote-tracking branch 'origin/master'

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -20,6 +20,7 @@ use app\adminapi\service\DistributeLeafletsService;
 use app\common\model\master_worker\MasterWorker;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\master_worker\MasterWorkerTeam;
+use app\common\model\master_worker_credential\MasterWorkerCredentialImages;
 use app\common\model\works\ServiceWork;
 use think\db\Query;
 use think\facade\Db;
@@ -153,7 +154,7 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
      */
     public function lists(): array
     {
-        $fields = ['mw.*','mwr.maintain_exp_type','mwr.other_exp_type','mws.comprehensive_score','mws.weight_score'];
+        $fields = ['mw.*','mwr.maintain_exp_type','mwr.other_exp_type','mwr.id as worker_register_id','mws.comprehensive_score','mws.weight_score'];
         $orders = ['mw.id' => 'desc'];
         $queryWhere = $this->queryWhere();
         //dd($queryWhere,$this->searchWhere);
@@ -188,9 +189,11 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->group('master_worker_id')
             ->select()->toArray(),'work_total','master_worker_id');
         $teams = MasterWorkerTeam::whereIn('master_worker_id', array_column($list, 'id'))->column('team_name','master_worker_id');
+        $images = array_column(MasterWorkerCredentialImages::whereIn('worker_register_id', array_column($list, 'worker_register_id'))->select()->toArray(),null,'worker_register_id');
         foreach ($list as &$item) {
             $item['work_total'] = $workCount[$item['id']]??0;
             $item['team_name'] = $teams[$item['id']]??'';
+            $item['credential_info'] = $images[$item['worker_register_id']]??[];
         }
         return $list;
     }

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -19,6 +19,7 @@ use app\common\model\master_worker\MasterWorker;
 use app\common\logic\BaseLogic;
 use app\common\model\master_worker\MasterWorkerScore;
 use app\common\model\master_worker\MasterWorkerRetentionMoneyLog;
+use app\common\model\master_worker_credential\MasterWorkerCredentialImages;
 use app\common\model\service_area\ServiceArea;
 use think\db\Query;
 use think\facade\Config;
@@ -219,7 +220,7 @@ class MasterWorkerLogic extends BaseLogic
         $info = MasterWorker::with(['workerInfo'=>function(Query $query){
             $query->field('worker_id,real_name,id_card,id_card_front_img,id_card_opposite_img,mobile,address');
         },'workerRegister'=>function(Query $query){
-            $query->field('worker_id,maintain_exp_type,other_exp_type,city,vehicle_type,name,age,mobile')->append(['maintain_exp_type_text','other_exp_type_text','vehicle_type_text','city_text']);
+            $query->field('id as worker_register_id,worker_id,maintain_exp_type,other_exp_type,city,vehicle_type,name,age,mobile')->append(['maintain_exp_type_text','other_exp_type_text','vehicle_type_text','city_text']);
         }])
             ->append(['time_period'])
             ->findOrEmpty($params['id'])->toArray();
@@ -232,6 +233,8 @@ class MasterWorkerLogic extends BaseLogic
             $info['is_up_retention_pay'] = 1;
         }
         $info['score'] = MasterWorkerScore::where(['worker_id' => $params['id']])->field('comprehensive_score,weight_score')->findOrEmpty()->toArray();
+        $images = MasterWorkerCredentialImages::where(['worker_register_id' => $info['workerRegister']['worker_register_id']])->select()->toArray();
+        $info['credential_info'] = $images;
         return $info;
     }
 

app/adminapi/logic/master_worker_credential/MasterWorkerCredentialImagesLogic.php

@@ -46,6 +46,7 @@ class MasterWorkerCredentialImagesLogic extends BaseLogic
                 'image' => $params['image'],
                 'start_time' => $params['start_time'],
                 'end_time' => $params['end_time'],
+                'audit_state' => $params['audit_state']??0,
             ]);
 
             Db::commit();
@@ -82,6 +83,8 @@ class MasterWorkerCredentialImagesLogic extends BaseLogic
                         'image_name' => $param['image_name'],
                         'start_time' => $param['start_time']??0,
                         'end_time' => $param['end_time']??0,
+                        'audit_state' => $param['audit_state']??0,
+                        'number' => $param['number']??'',
                     ]);
                     $credential_images[] = $param;
                 }

app/workerapi/controller/MasterWorkerController.php

@@ -7,6 +7,7 @@ use app\common\model\dict\DictData;
 use app\workerapi\logic\LoginLogic;
 use app\workerapi\logic\MasterWorkerInfoLogic;
 use app\workerapi\logic\MasterWorkerLogic;
+use app\workerapi\logic\MasterWorkerRegisterLogic;
 use app\workerapi\validate\BankAccountValidate;
 use app\workerapi\validate\MasterWokerInfoValidate;
 use app\workerapi\validate\MasterWokerValidate;
@@ -176,4 +177,21 @@ class MasterWorkerController extends BaseApiController
         echo $result;
         die;
     }
+
+    public function getCredential()
+    {
+        $result = MasterWorkerRegisterLogic::credential($this->userId);
+        return $this->data($result);
+    }
+    public function setCredential()
+    {
+        $params = request()->post();
+        $result = MasterWorkerRegisterLogic::setCredential($params);
+        if (false === $result) {
+            return $this->fail(MasterWorkerRegisterLogic::getError());
+        }
+        return $this->success('操作成功', [], 1, 1);
+    }
+
+
 }

app/workerapi/logic/MasterWorkerRegisterLogic.php

@@ -5,12 +5,14 @@ use app\adminapi\logic\training\TrainingBlockConfigLogic;
 use app\adminapi\logic\training\TrainingWorkerTaskLogic;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\master_worker\MasterWorkerScore;
+use app\common\model\master_worker_credential\MasterWorkerCredentialImages;
 use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\model\service_area\ServiceArea;
 use app\common\logic\BaseLogic;
 use app\common\model\sale\Sale;
 use app\common\service\ConfigService;
 use think\facade\Config;
+use think\facade\Db;
 use think\facade\Log;
 
 /**
@@ -99,4 +101,46 @@ class MasterWorkerRegisterLogic extends BaseLogic
         }
         return $masterWorker->id;
     }
+
+
+    /**
+     * 获取证件
+     */
+    public static function credential($worker_register_id): array
+    {
+        return MasterWorkerCredentialImages::where('worker_register_id', $worker_register_id)->select()->toArray();
+    }
+    /**
+     * 修改证件
+     */
+    public static function setCredential(array $params)
+    {
+        Db::startTrans();
+        try {
+            MasterWorkerCredentialImages::where('id', $params['id'])->update([
+                'worker_register_id' => $params['worker_register_id'],
+                'image' => $params['image'],
+                'image_name' => $params['image_name'],
+                'start_time' => strtotime($params['start_time']??0),
+                'end_time' => strtotime($params['end_time']??0),
+                'audit_state' => 0,
+                'number' => $params['number']??'',
+            ]);
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+
+
+
+
+
+
+
 }