mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-23 15:30:03 +08:00
parent f9cfccf69c
commit e65b612140
3 changed files with 160 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
View File

@ -15,12 +15,12 @@
namespace app\adminapi\logic\project; namespace app\adminapi\logic\project;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin; use app\common\model\auth\Admin;
use app\common\model\contract\Contract; use app\common\model\contract\Contract;
use app\common\model\custom\Custom; use app\common\model\custom\Custom;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\project\ProjectManagerAppointment; use app\common\model\project\ProjectManagerAppointment;
use app\common\logic\BaseLogic;
use app\common\model\project\ProjectTypeSet; use app\common\model\project\ProjectTypeSet;
use think\facade\Db; use think\facade\Db;
@ -46,8 +46,6 @@ class ProjectManagerAppointmentLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
ProjectManagerAppointment::create([ ProjectManagerAppointment::create([
'org_id' => $params['org_id'],
'dept_id' => $params['dept_id'],
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'contract_id' => $params['contract_id'], 'contract_id' => $params['contract_id'],
'project_type_id' => $params['project_type_id'], 'project_type_id' => $params['project_type_id'],

29
app/adminapi/validate/project/ProjectManagerAppointmentValidate.php
View File

@ -17,8 +17,6 @@
use app\common\model\auth\Admin; use app\common\model\auth\Admin;
use app\common\model\contract\Contract; use app\common\model\contract\Contract;
use app\common\model\dept\Dept;
use app\common\model\dept\Orgs;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\project\ProjectManagerAppointment; use app\common\model\project\ProjectManagerAppointment;
use app\common\model\project\ProjectTypeSet; use app\common\model\project\ProjectTypeSet;
@ -39,8 +37,6 @@
*/ */
protected $rule = [ protected $rule = [
'id' => 'require|checkData', 'id' => 'require|checkData',
'org_id' => 'require|checkOrg',
'dept_id' => 'require|checkDept',
'project_id' => 'require|checkProject', 'project_id' => 'require|checkProject',
'contract_id' => 'require|checkContract', 'contract_id' => 'require|checkContract',
'project_type_id' => 'require|checkProjectType', 'project_type_id' => 'require|checkProjectType',
@ -53,8 +49,6 @@
protected $message = [ protected $message = [
'id.require' => '缺少必要参数', 'id.require' => '缺少必要参数',
'org_id.require' => '请选择组织',
'dept_id.require' => '请选择部门',
'project_id.require' => '请选择项目', 'project_id.require' => '请选择项目',
'contract_id.require' => '请选择合同', 'contract_id.require' => '请选择合同',
'project_type_id.require' => '请选择项目类型', 'project_type_id.require' => '请选择项目类型',
@ -79,8 +73,6 @@
'id' => 'id', 'id' => 'id',
'project_id' => '项目id', 'project_id' => '项目id',
'contract_id' => '合同id', 'contract_id' => '合同id',
'org_id' => '组织id',
'dept_id' => '部门id',
'project_type_id' => '项目类型', 'project_type_id' => '项目类型',
'project_manager' => '项目经理', 'project_manager' => '项目经理',
'amount' => '项目金额', 'amount' => '项目金额',
@ -147,27 +139,6 @@
return true; return true;
} }
public function checkOrg($value): bool|string
{
$data = Orgs::where('id', $value)->findOrEmpty();
if ($data->isEmpty()) {
return '组织不存在';
}
return true;
}
public function checkDept($value, $rule, $data): bool|string
{
$dept = Dept::where('id', $value)->findOrEmpty();
if ($dept->isEmpty()) {
return '部门不存在';
}
if ($data['org_id'] != $dept['org_id']) {
return '部门不属于当前选择的组织';
}
return true;
}
public function checkProject($value): bool|string public function checkProject($value): bool|string
{ {
$data = Project::where('id', $value)->findOrEmpty(); $data = Project::where('id', $value)->findOrEmpty();

6
app/common/model/project/ProjectManagerAppointment.php
View File

@ -27,6 +27,7 @@ use think\model\concern\SoftDelete;
class ProjectManagerAppointment extends BaseModel class ProjectManagerAppointment extends BaseModel
{ {
use SoftDelete; use SoftDelete;
protected $name = 'project_manager_appointment'; protected $name = 'project_manager_appointment';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
@ -44,9 +45,4 @@ class ProjectManagerAppointment extends BaseModel
{ {
return !empty($value) ? date('Y-m-d', $value) : ''; return !empty($value) ? date('Y-m-d', $value) : '';
} }
public function getAnnexAttr($value)
{
return !empty($value) ? json_decode($value,true) : '';
}
} }