周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 4d58b7412d9ca0be7c25ec87395a7bc6d209cf13 2 个父辈 39aaff83 6956ec77

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

内嵌 并排对比
正在显示 10 个修改的文件 包含 434 行增加 和 4 行删除
1 /node_modules 1 /node_modules
2 /public/hot 2 /public/hot
3 /public/storage 3 /public/storage
  4 +/public/.user.ini
4 /storage 5 /storage
5 /vendor 6 /vendor
6 /uploads 7 /uploads
7 -composer.json 8 +composer.lock
8 .env 9 .env
9 .env.backup 10 .env.backup
10 .phpunit.result.cache 11 .phpunit.result.cache
@@ -17,6 +17,7 @@ class AsideGlobalException extends Exception @@ -17,6 +17,7 @@ class AsideGlobalException extends Exception
17 { 17 {
18 $this->code = $code; 18 $this->code = $code;
19 $this->message = $message; 19 $this->message = $message;
  20 +
20 if (empty($this->message)) { 21 if (empty($this->message)) {
21 $this->message = Code::fromValue($code)->description; 22 $this->message = Code::fromValue($code)->description;
22 } 23 }
  1 +<?php
  2 +
  3 +namespace App\Http\Controllers\Aside\Manage;
  4 +use App\Enums\Common\Code;
  5 +use App\Http\Controllers\Aside\BaseController;
  6 +use Illuminate\Http\Request;
  7 +use App\Http\Logic\Aside\Manage\HrLogic;
  8 +
  9 +class HrController extends BaseController
  10 +{
  11 + public function list(Request $request, HrLogic $logic)
  12 + {
  13 + $list = $logic->getList($this->param);
  14 + return $this->response('success', Code::SUCCESS, $list);
  15 + }
  16 +
  17 + public function info(Request $request, HrLogic $logic){
  18 + $request->validate([
  19 + 'id'=>'required'
  20 + ],[
  21 + 'id.required' => 'ID不能为空'
  22 + ]);
  23 + $data = $logic->getInfo($this->param['id']);
  24 + //print_r($data);exit;
  25 + return $this->success($data);
  26 + }
  27 +
  28 + public function save(Request $request, HrLogic $logic){
  29 + $data = $logic->save($this->param);
  30 + return $this->success($data);
  31 + }
  32 +
  33 + public function parm_desciption(HrLogic $logic){
  34 + $data = $logic->parms();
  35 + return $this->success($data);
  36 + }
  37 +
  38 +}
  1 +<?php
  2 +
  3 +namespace App\Http\Logic\Aside\Manage;
  4 +
  5 +
  6 +use App\Http\Logic\Aside\BaseLogic;
  7 +use App\Models\Manage\ManageHr;
  8 +
  9 +
  10 +/**
  11 + * Class ManageHrLogic
  12 + * @package App\Http\Logic\Aside\Manage
  13 + * @author zgj
  14 + * @date 2023/5/30
  15 + */
  16 +class HrLogic extends BaseLogic
  17 +{
  18 + public function __construct()
  19 + {
  20 + parent::__construct();
  21 + $this->model = new ManageHr();
  22 + }
  23 +
  24 +
  25 + public function save($param){
  26 + foreach ($this->model::specielField() as $v){
  27 + $param = $this->setJson($v,$param);
  28 + }
  29 + return parent::save($param);
  30 + }
  31 +
  32 + public function getInfo($id){
  33 + $data = parent::getInfo($id);
  34 + foreach ($this->model::specielField() as $v){
  35 + $data[$v] = json_decode($data[$v],true);
  36 + }
  37 + return $data;
  38 + }
  39 +
  40 + //数组转json存储
  41 + public function setJson($str,$param){
  42 + if(isset($param[$str]) && is_array($param[$str])){
  43 + $param[$str] = json_encode($param[$str]);
  44 + }else{
  45 + $param[$str] = '';
  46 + }
  47 + return $param;
  48 + }
  49 +
  50 + public function parms(){
  51 + $data['belong_group'] = $this->model::belongGroup();
  52 + $data['education'] = $this->model::education();
  53 + $data['entry_position'] = $this->model::entryPosition();
  54 + $data['p_level'] = $this->model::pLevel();
  55 + $data['dangyuan'] = $this->model::dangyuan();
  56 + $data['dangzhibu'] = $this->model::dangzhibu();
  57 + return $data;
  58 + }
  59 +}
@@ -145,9 +145,7 @@ class Logic @@ -145,9 +145,7 @@ class Logic
145 $this->model[$name] = $value; 145 $this->model[$name] = $value;
146 } 146 }
147 } 147 }
148 -  
149 $res = $this->model->save(); 148 $res = $this->model->save();
150 -  
151 if($res){ 149 if($res){
152 //清缓存 150 //清缓存
153 if($this->is_cache && !empty($param['id'])){ 151 if($this->is_cache && !empty($param['id'])){
  1 +<?php
  2 +
  3 +namespace App\Models\Aside;
  4 +
  5 +use Illuminate\Database\Eloquent\Factories\HasFactory;
  6 +use Illuminate\Database\Eloquent\Model;
  7 +
  8 +class ManageHrLogModel extends Model
  9 +{
  10 + protected $table = 'gl_manage_hr_log';
  11 + use HasFactory;
  12 +}
  1 +<?php
  2 +
  3 +namespace App\Models\Aside;
  4 +
  5 +use Illuminate\Database\Eloquent\Factories\HasFactory;
  6 +use Illuminate\Database\Eloquent\Model;
  7 +use App\Models\Base;
  8 +
  9 +class ManageHrModel extends Base
  10 +{
  11 + protected $table = 'gl_manage_hrs';
  12 + //use HasFactory;
  13 + protected $guarded = ['updated_at'];
  14 + /**
  15 + * 归属小组
  16 + * @return string[]
  17 + * @author zgj
  18 + * @date 2023/5/31
  19 + */
  20 + public static function belongGroup()
  21 + {
  22 + return [
  23 + 1 => 'KA组',
  24 + 2 => 'A组',
  25 + 3 => 'B组',
  26 + 4 => 'C组',
  27 + 5 => 'D组',
  28 + 6 => 'E组',
  29 + 7 => 'F组',
  30 + 8 => 'G组',
  31 + 9 => 'H组',
  32 + 10 => 'GA组',
  33 + 11=> 'GB组',
  34 + 12 => 'GC组',
  35 + 13 => '前端组',
  36 + 14 => '后端组',
  37 + 15 => '黑格组',
  38 + 16 => '售后组',
  39 + 0 => '其他',
  40 + ];
  41 + }
  42 +
  43 + /**
  44 + * 学历
  45 + * @return string[]
  46 + * @author zgj
  47 + * @date 2023/5/31
  48 + */
  49 + public static function education()
  50 + {
  51 + return [
  52 + 1 => '专科',
  53 + 2 => '本科',
  54 + 3 => '研究生及以上',
  55 + 0 => '其他',
  56 + ];
  57 + }
  58 + /**
  59 + * 入职岗位
  60 + * @return string[]
  61 + * @author zgj
  62 + * @date 2023/5/31
  63 + */
  64 + public static function entryPosition()
  65 + {
  66 + return [
  67 + 1 => '优化师',
  68 + 2 => '优化师助理',
  69 + 3 => '优化顾问',
  70 + 4 => '项目经理',
  71 + 5 => '平面设计',
  72 + 6 => '技术经理',
  73 + 7 => '技术主管',
  74 + 8 => '技术总监',
  75 + 9 => '渠道经理',
  76 + 10 => '前端研发',
  77 + 11=> '后端研发',
  78 + 12 => '行政财务',
  79 + 13 => '品牌营销',
  80 + 14 => '销售经理',
  81 + 15 => '销售主管',
  82 + 16 => '售后技术',
  83 + 17 => '售后服务',
  84 + 18 => '外贸销售',
  85 + 19 => '渠道助理',
  86 + 20 => '黑格运营',
  87 + 21 => '运营',
  88 + 22 => '短视频剪辑师',
  89 + 23 => '人事',
  90 + 24 => '采购',
  91 + 0 => '其他',
  92 + ];
  93 + }
  94 +
  95 + /**
  96 + * 级别序列
  97 + * @return string[]
  98 + * @author zgj
  99 + * @date 2023/5/31
  100 + */
  101 + public static function pLevel()
  102 + {
  103 + return [
  104 + 0 => '实习期/试用期(P0)',
  105 + 1 => '初级(P1)',
  106 + 2 => '初级(P2)',
  107 + 3 => '初级(P3)',
  108 + 4 => '中级(P4)',
  109 + 5 => '中级(P5)',
  110 + 6 => '中级(P6)',
  111 + 7 => '高级(P7)',
  112 + 8 => '高级(P8)',
  113 + 9 => '高级(P9)',
  114 + 10 => '高级(P10)',
  115 + 11=> '职务初级(M1)',
  116 + 12 => '职务初级(M2)',
  117 + 13 => '职务初级(M3)',
  118 + 14 => '职务中级(M4)',
  119 + 15 => '职务中级(M5)',
  120 + 16 => '职务中级(M6)',
  121 + 17 => '职务高级(M7)',
  122 + 18 => '职务高级(M8)',
  123 + 19 => '职务高级(M9)',
  124 + 20 => '职务高级(M10)',
  125 + ];
  126 + }
  127 + /**
  128 + * 是否党员
  129 + * @return string[]
  130 + * @author zgj
  131 + * @date 2023/5/31
  132 + */
  133 + public static function dangyuan()
  134 + {
  135 + return [
  136 + 0 => '群众',
  137 + 1 => '预备党员',
  138 + 2 => '正式党员',
  139 + ];
  140 + }
  141 +
  142 + /**
  143 + * 是否有党支部
  144 + * @return string[]
  145 + * @author zgj
  146 + * @date 2023/5/31
  147 + */
  148 + public static function dangzhibu()
  149 + {
  150 + return [
  151 + 0 => '无',
  152 + 1 => '是',
  153 + 2 => '否',
  154 + ];
  155 + }
  156 +}
  1 +<?php
  2 +
  3 +namespace App\Models\Manage;
  4 +use App\Models\Base;
  5 +
  6 +class ManageHr extends Base
  7 +{
  8 + protected $table = 'gl_manage_hr';
  9 +
  10 + /**
  11 + * 特殊字段
  12 + * @return string[]
  13 + * @author zgj
  14 + * @date 2023/5/31
  15 + */
  16 + public static function specielField(){
  17 + return ['photo_gallery','id_card_gallery','certificate_gallery','career_history','learning_history'];
  18 + }
  19 +
  20 + /**
  21 + * 归属小组
  22 + * @return string[]
  23 + * @author zgj
  24 + * @date 2023/5/31
  25 + */
  26 + public static function belongGroup()
  27 + {
  28 + return [
  29 + 1 => 'KA组',
  30 + 2 => 'A组',
  31 + 3 => 'B组',
  32 + 4 => 'C组',
  33 + 5 => 'D组',
  34 + 6 => 'E组',
  35 + 7 => 'F组',
  36 + 8 => 'G组',
  37 + 9 => 'H组',
  38 + 10 => 'GA组',
  39 + 11=> 'GB组',
  40 + 12 => 'GC组',
  41 + 13 => '前端组',
  42 + 14 => '后端组',
  43 + 15 => '黑格组',
  44 + 16 => '售后组',
  45 + 0 => '其他',
  46 + ];
  47 + }
  48 +
  49 + /**
  50 + * 学历
  51 + * @return string[]
  52 + * @author zgj
  53 + * @date 2023/5/31
  54 + */
  55 + public static function education()
  56 + {
  57 + return [
  58 + 1 => '专科',
  59 + 2 => '本科',
  60 + 3 => '研究生及以上',
  61 + 0 => '其他',
  62 + ];
  63 + }
  64 + /**
  65 + * 入职岗位
  66 + * @return string[]
  67 + * @author zgj
  68 + * @date 2023/5/31
  69 + */
  70 + public static function entryPosition()
  71 + {
  72 + return [
  73 + 1 => '优化师',
  74 + 2 => '优化师助理',
  75 + 3 => '优化顾问',
  76 + 4 => '项目经理',
  77 + 5 => '平面设计',
  78 + 6 => '技术经理',
  79 + 7 => '技术主管',
  80 + 8 => '技术总监',
  81 + 9 => '渠道经理',
  82 + 10 => '前端研发',
  83 + 11=> '后端研发',
  84 + 12 => '行政财务',
  85 + 13 => '品牌营销',
  86 + 14 => '销售经理',
  87 + 15 => '销售主管',
  88 + 16 => '售后技术',
  89 + 17 => '售后服务',
  90 + 18 => '外贸销售',
  91 + 19 => '渠道助理',
  92 + 20 => '黑格运营',
  93 + 21 => '运营',
  94 + 22 => '短视频剪辑师',
  95 + 23 => '人事',
  96 + 24 => '采购',
  97 + 0 => '其他',
  98 + ];
  99 + }
  100 +
  101 + /**
  102 + * 级别序列
  103 + * @return string[]
  104 + * @author zgj
  105 + * @date 2023/5/31
  106 + */
  107 + public static function pLevel()
  108 + {
  109 + return [
  110 + 0 => '实习期/试用期(P0)',
  111 + 1 => '初级(P1)',
  112 + 2 => '初级(P2)',
  113 + 3 => '初级(P3)',
  114 + 4 => '中级(P4)',
  115 + 5 => '中级(P5)',
  116 + 6 => '中级(P6)',
  117 + 7 => '高级(P7)',
  118 + 8 => '高级(P8)',
  119 + 9 => '高级(P9)',
  120 + 10 => '高级(P10)',
  121 + 11=> '职务初级(M1)',
  122 + 12 => '职务初级(M2)',
  123 + 13 => '职务初级(M3)',
  124 + 14 => '职务中级(M4)',
  125 + 15 => '职务中级(M5)',
  126 + 16 => '职务中级(M6)',
  127 + 17 => '职务高级(M7)',
  128 + 18 => '职务高级(M8)',
  129 + 19 => '职务高级(M9)',
  130 + 20 => '职务高级(M10)',
  131 + ];
  132 + }
  133 + /**
  134 + * 是否党员
  135 + * @return string[]
  136 + * @author zgj
  137 + * @date 2023/5/31
  138 + */
  139 + public static function dangyuan()
  140 + {
  141 + return [
  142 + 0 => '群众',
  143 + 1 => '预备党员',
  144 + 2 => '正式党员',
  145 + ];
  146 + }
  147 +
  148 + /**
  149 + * 是否有党支部
  150 + * @return string[]
  151 + * @author zgj
  152 + * @date 2023/5/31
  153 + */
  154 + public static function dangzhibu()
  155 + {
  156 + return [
  157 + 0 => '无',
  158 + 1 => '是',
  159 + 2 => '否',
  160 + ];
  161 + }
  162 +}
此 diff 太大无法显示。
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 use \Illuminate\Support\Facades\Route; 5 use \Illuminate\Support\Facades\Route;
6 use \App\Http\Controllers\Aside; 6 use \App\Http\Controllers\Aside;
7 7
8 -//必须登录验证的路由组 8 +
  9 +
9 Route::middleware(['aloginauth'])->group(function () { 10 Route::middleware(['aloginauth'])->group(function () {
10 Route::get('/', [Aside\IndexController::class, 'index'])->name('admin.home.white'); 11 Route::get('/', [Aside\IndexController::class, 'index'])->name('admin.home.white');
11 Route::get('/get_menu', [Aside\IndexController::class, 'get_menu'])->name('admin.get_menu.white'); 12 Route::get('/get_menu', [Aside\IndexController::class, 'get_menu'])->name('admin.get_menu.white');
@@ -45,6 +46,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -45,6 +46,7 @@ Route::middleware(['aloginauth'])->group(function () {
45 Route::any('/read', [Aside\User\ProjectDeptController::class, 'read'])->name('admin.group_info'); 46 Route::any('/read', [Aside\User\ProjectDeptController::class, 'read'])->name('admin.group_info');
46 }); 47 });
47 48
  49 +
48 }); 50 });
49 51
50 //ai指令 52 //ai指令
@@ -176,6 +178,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -176,6 +178,7 @@ Route::middleware(['aloginauth'])->group(function () {
176 Route::get('/delete_list', [Aside\Domain\DomainInfoController::class, 'delete_list'])->name('admin.domain_delete_list'); // 删除列表 178 Route::get('/delete_list', [Aside\Domain\DomainInfoController::class, 'delete_list'])->name('admin.domain_delete_list'); // 删除列表
177 Route::any('/restore', [Aside\Domain\DomainInfoController::class, 'restore'])->name('admin.domain_restore'); // 恢复 179 Route::any('/restore', [Aside\Domain\DomainInfoController::class, 'restore'])->name('admin.domain_restore'); // 恢复
178 Route::get('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists'); // 日志 180 Route::get('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists'); // 日志
  181 +
179 }); 182 });
180 //图片操作 183 //图片操作
181 Route::prefix('images')->group(function () { 184 Route::prefix('images')->group(function () {