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-28 11:12:29 +08:00
parent a05482cfda
commit 2fd360b7e3
3 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php
View File

@ -39,6 +39,7 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea
{
return [
'=' => ['num', 'project', 'project_num'],
];
}
@ -54,8 +55,7 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea
*/
public function lists(): array
{
return ProjectProgressPayment::where($this->searchWhere)
->field(['id', 'dataid', 'num', 'project', 'project_num', 'djr', 'djrq', 'sbhj', 'shhj', 'ljhj', 'annex'])
return ProjectProgressPayment::with(['projectInfo'])->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()

14
app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php
View File

@ -41,10 +41,9 @@ class ProjectProgressPaymentLogic extends BaseLogic
Db::startTrans();
try {
ProjectProgressPayment::create([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
'num' => generate_sn(ProjectProgressPayment::class, 'num'),
'project_id' => $params['project_id'],
'djr' => $params['djr'],
'djrq' => $params['djrq'],
'sbhj' => $params['sbhj'],
@ -75,10 +74,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
Db::startTrans();
try {
ProjectProgressPayment::where('id', $params['id'])->update([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'project_id' => $params['project_id'],
'djr' => $params['djr'],
'djrq' => $params['djrq'],
'sbhj' => $params['sbhj'],
@ -119,6 +115,6 @@ class ProjectProgressPaymentLogic extends BaseLogic
*/
public static function detail($params): array
{
return ProjectProgressPayment::findOrEmpty($params['id'])->toArray();
return ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
}
}

6
app/common/model/project_process_management/ProjectProgressPayment.php
View File

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