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:18:40 +08:00
parent 2fd360b7e3
commit 4a94919d54
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,9 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()
->each(function($item){
$item['annex'] = json_decode($item['annex'], true);
})
->toArray(); ->toArray();
} }

2
app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php
View File

@ -41,7 +41,7 @@ class ProjectChangeVisaContentLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
ProjectChangeVisaContent::create([ ProjectChangeVisaContent::create([
'project_change_visa_dataid' => $params['project_change_visa_dataid'], 'project_progress_payment_id' => $params['project_progress_payment_id'],
'directory' => $params['directory'], 'directory' => $params['directory'],
'unit_name' => $params['unit_name'], 'unit_name' => $params['unit_name'],
'time' => $params['time'], 'time' => $params['time'],

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

@ -40,7 +40,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
ProjectProgressPayment::create([ $p = ProjectProgressPayment::create([
'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'), 'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
'num' => generate_sn(ProjectProgressPayment::class, 'num'), 'num' => generate_sn(ProjectProgressPayment::class, 'num'),
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
@ -49,9 +49,12 @@ class ProjectProgressPaymentLogic extends BaseLogic
'sbhj' => $params['sbhj'], 'sbhj' => $params['sbhj'],
'shhj' => $params['shhj'], 'shhj' => $params['shhj'],
'ljhj' => $params['ljhj'], 'ljhj' => $params['ljhj'],
'annex' => $params['annex'], 'annex' => json_encode($params['annex'])
]); ]);
foreach ($params['project_progress_payment_detail'] as $item) {
$item['project_progress_payment_id'] = $p->id;
ProjectChangeVisaContentLogic::add($item);
}
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -80,7 +83,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
'sbhj' => $params['sbhj'], 'sbhj' => $params['sbhj'],
'shhj' => $params['shhj'], 'shhj' => $params['shhj'],
'ljhj' => $params['ljhj'], 'ljhj' => $params['ljhj'],
'annex' => $params['annex'], 'annex' => json_encode($params['annex'])
]); ]);
Db::commit(); Db::commit();
@ -115,6 +118,8 @@ class ProjectProgressPaymentLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); $data = ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['annex'] = json_decode($data['annex'], true);
return $data;
} }
} }