This commit is contained in:
chenbo 2024-02-28 11:29:03 +08:00
parent 1aecc6692f
commit 516c1e9f39
3 changed files with 10 additions and 3 deletions

View File

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

View File

@ -17,6 +17,7 @@ namespace app\adminapi\logic\project_process_management;
use app\common\model\project_process_management\ProjectChangeVisa;
use app\common\logic\BaseLogic;
use app\common\model\project_process_management\ProjectChangeVisaContent;
use think\facade\Db;
@ -110,6 +111,8 @@ class ProjectChangeVisaLogic extends BaseLogic
*/
public static function detail($params): array
{
return ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data = ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
return $data;
}
}

View File

@ -55,6 +55,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
'content' => $params['content'],
'result' => $params['result'],
'remark' => $params['remark'],
'annex' => json_encode($params['annex'])
]);
Db::commit();
@ -91,6 +92,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
'content' => $params['content'],
'result' => $params['result'],
'remark' => $params['remark'],
'annex' => json_encode($params['annex'])
]);
Db::commit();
@ -125,6 +127,8 @@ class ProjectSurveySignatureLogic extends BaseLogic
*/
public static function detail($params): array
{
return ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['annex'] = json_decode($data['annex'], true);
return $data;
}
}