合并分支 'master-server' 到 'master'

Master server



查看合并请求 !665

@@ -59,102 +59,4 @@ class Demo extends Command
         }
         return true;
     }
-
-//    public function handle(){
-//        $keywordVideoModel = new KeywordVideoTask();
-//        $project_id_arr = $keywordVideoModel::where('id','>',0)->pluck('project_id')->toArray();
-//        //查看是否有子记录
-//        foreach ($project_id_arr as $values){
-//            $logModel = new KeywordVideoTaskLog();
-//            $logInfo = $logModel->read(['project_id'=>$values]);
-//            if($logInfo === false){
-//                echo date('Y-m-d H:i:s') . '开启的项目project_id:'.$values . PHP_EOL;
-//                $keywordVideoModel->edit(['status'=>0],['project_id'=>$values]);
-//            }
-//        }
-//        $projectModel = new Project();
-//        $list = $projectModel->list(['type'=>['!=',0],'delete_status'=>0,'id'=>['in',$project_id_arr]]);
-//        $data = [];
-//        foreach ($list as $v){
-//            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-//            ProjectServer::useProject($v['id']);
-//            $this->getProductList();
-//            DB::disconnect('custom_mysql');
-//        }
-//        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
-//    }
-
-//    public function getProductList(){
-//        $productModel = new Product();
-//        $product_all_id = $productModel::whereRaw('LENGTH(keyword_id) > 50')->pluck('id')->toArray();
-//        if(empty($product_all_id)){
-//            return true;
-//        }
-//        $lists = $productModel->whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get()->toArray();
-//        foreach ($lists as $k => $v){
-//            echo date('Y-m-d H:i:s') . '项目id:'.$v['project_id'].'+产品product_id:'.$v['id'] . PHP_EOL;
-//            $str = ',';
-//            shuffle($v['keyword_id']);
-//            foreach ($v['keyword_id'] as $key => $value){
-//                if($key == 6){
-//                    break;
-//                }
-//                $str .= $value.',';
-//            }
-//            $productModel->edit(['keyword_id'=>$str],['id'=>$v['id']]);
-//        }
-//        return true;
-//    }
-//
-//    /**
-//     * @remark :关键字有视频的改为1
-//     * @name   :getProductKeywordInfo
-//     * @author :lyh
-//     * @method :post
-//     * @time   :2024/5/31 9:54
-//     */
-//    public function saveKeyword(){
-//        $keywordModel = new Keyword();
-//        $rs = $keywordModel->edit(['is_video_keyword'=>0],['video'=>'']);
-//        echo date('Y-m-d H:i:s') . 'end'.$rs . PHP_EOL;
-//        return true;
-//    }
-
-//    public function handle(){
-//        //切换数据库配置
-//        ProjectServer::useProject(1862);
-//        return $this->initTable(1380,1862);
-//    }
-//
-//    public function initTable($project_id, $news_project_id)
-//    {
-//        config(['database.connections.custom_tmp_mysql_copy.database' => 'gl_data_' . $project_id]);
-//        $database_name = DB::connection('custom_tmp_mysql_copy')->getDatabaseName();
-//        $tables = Schema::connection('custom_tmp_mysql_copy')->getAllTables();
-//        $tables = array_column($tables, 'Tables_in_' . $database_name);
-//        foreach ($tables as $table) {
-//            $has_table = Schema::connection('custom_mysql')->hasTable($table);
-//            if (!$has_table) {
-//                $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
-//                DB::connection('custom_mysql')->statement(array_values((array)$sql[0])[0]); // 修正此处的sql语句获取方式
-//            }
-//
-//            if ($table == 'gl_customer_visit' || $table == 'gl_customer_visit_item' || $table == 'gl_inquiry_other' || $table == 'gl_inquiry_form_data' || $table == 'gl_inquiry_form') {
-//                continue;
-//            }
-//            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
-//            DB::connection('custom_mysql')->table($table)->insertUsing(
-//                [], // 列名数组，留空表示插入所有列
-//                function ($query) use ($table, $project_id) {
-//                    $name = 'gl_data_' . $project_id . '.' . $table;
-//                    $query->select('*')->from("{$name}");
-//                }
-//            );
-//
-//            if (Schema::connection('custom_mysql')->hasColumn($table, 'project_id')) {
-//                DB::connection('custom_mysql')->table($table)->update(['project_id' => $news_project_id]);
-//            }
-//        }
-//        return true;
-//    }
 }

@@ -39,7 +39,8 @@ class HrLogic extends BaseLogic
      * @time   :2023/9/6 10:17
      */
     public function hrSave(){
-            //处理参数
+        $this->handleParam();
+        //处理参数
         foreach ($this->model::specieField() as $v){
             $this->param = $this->setJson($v,$this->param);
         }
@@ -52,6 +53,22 @@ class HrLogic extends BaseLogic
     }
 
     /**
+     * @remark :处理字段
+     * @name   :handleParam
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/10 16:32
+     */
+    public function handleParam(){
+        $this->param['status'] = empty($this->param['status']) ? 1 : $this->param['status'];
+        $this->param['education'] = empty($this->param['education']) ? 1 : $this->param['education'];
+        $this->param['entry_position'] = empty($this->param['entry_position']) ? 1 : $this->param['entry_position'];
+        $this->param['p_level'] = empty($this->param['p_level']) ? 1 : $this->param['p_level'];
+        $this->param['dept_id'] = empty($this->param['dept_id']) ? 1 : $this->param['dept_id'];
+        $this->param['belong_group'] = empty($this->param['belong_group']) ? 1 : $this->param['belong_group'];
+    }
+
+    /**
      * @remark :添加人事信息时 同步添加管理员账号
      * @name   :addManager
      * @author :lyh
@@ -70,18 +87,18 @@ class HrLogic extends BaseLogic
             'password'=>Hash::make('globalsov6'),
             'gid'=>4,
         ];
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             $managerModel = new Manage();
             $this->param['manage_id'] = $managerModel->addReturnId($data);
             $this->model->add($this->param);
             //同步到B端演示项目
             $this->syncBProjectUser($this->param['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('系统错误请联系管理员');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('系统错误请联系管理员');
+        }
         return $this->success();
     }