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

update

Browse Source
This commit is contained in:
chenbo 2024-02-27 15:59:20 +08:00
parent ba9b372500
commit b25848903b
7 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/ProjectCommissionLists.php
View File

@ -39,6 +39,7 @@ class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchIn
{
return [
'=' => ['num', 'project', 'project_num'],
];
}
@ -55,7 +56,6 @@ class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchIn
public function lists(): array
{
return ProjectCommission::where($this->searchWhere)
->field(['id', 'dataid', 'num', 'project', 'project_num', 'head', 'affcontract', 'industry', 'hk', 'rate', 'ticheng', 'paid_amount', 'bczfze', 'djr', 'apptime', 'remark'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()

4
app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php
View File

@ -43,7 +43,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
ApprovalIssuanceAchievementDocuments::create([
'dataid' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'dataid'),
'num' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'num'),
'project_id' => $params['project'],
'project_id' => $params['project_id'],
'task' => $params['task'],
'processes' => $params['processes'],
'number' => $params['number'],
@ -77,7 +77,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
Db::startTrans();
try {
ApprovalIssuanceAchievementDocuments::where('id', $params['id'])->update([
'project_id' => $params['project'],
'project_id' => $params['project_id'],
'task' => $params['task'],
'processes' => $params['processes'],
'number' => $params['number'],

7
app/adminapi/logic/DataReceptionLogic.php
View File

@ -41,10 +41,9 @@ class DataReceptionLogic extends BaseLogic
Db::startTrans();
try {
DataReception::create([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'dataid' => generate_sn(DataReception::class, 'dataid'),
'num' => generate_sn(DataReception::class, 'num'),
'project_id' => $params['project_id'],
'apptime' => $params['apptime'],
'person' => $params['person'],
'number' => $params['number'],

14
app/adminapi/logic/ProjectCommissionLogic.php
View File

@ -41,11 +41,9 @@ class ProjectCommissionLogic extends BaseLogic
Db::startTrans();
try {
ProjectCommission::create([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'head' => $params['head'],
'dataid' => generate_sn(ProjectCommission::class,'dataid'),
'num' => generate_sn(ProjectCommission::class,'num'),
'project_id' => $params['project_id'],
'affcontract' => $params['affcontract'],
'industry' => $params['industry'],
'hk' => $params['hk'],
@ -80,11 +78,7 @@ class ProjectCommissionLogic extends BaseLogic
Db::startTrans();
try {
ProjectCommission::where('id', $params['id'])->update([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'head' => $params['head'],
'project_id' => $params['project_id'],
'affcontract' => $params['affcontract'],
'industry' => $params['industry'],
'hk' => $params['hk'],

2
app/adminapi/logic/task/TaskTypeLogic.php
View File

@ -41,7 +41,7 @@ class TaskTypeLogic extends BaseLogic
Db::startTrans();
try {
TaskType::create([
'dataid' => $params['dataid'],
'dataid' => generate_sn(TaskType::class, 'dataid'),
'cost_project_id' => $params['cost_project_id'],
'num' => $params['num'],
'name' => $params['name'],

6
app/common/model/ProjectCommission.php
View File

@ -16,6 +16,7 @@ namespace app\common\model;
use app\common\model\BaseModel;
use app\common\model\cost_project\CostProject;
use think\model\concern\SoftDelete;
@ -30,5 +31,8 @@ class ProjectCommission extends BaseModel
protected $name = 'project_commission';
protected $deleteTime = 'delete_time';
public function projectInfo()
{
return $this->hasOne(CostProject::class, 'id', 'project_id');
}
}

5
app/common/model/ProjectCommissionDetail.php
View File

@ -30,5 +30,8 @@ class ProjectCommissionDetail extends BaseModel
protected $name = 'project_commission_detail';
protected $deleteTime = 'delete_time';
public function projectCommission()
{
return $this->belongsTo(ProjectCommission::class, 'project_commission_id', 'id');
}
}