diff --git a/app/adminapi/lists/build/BuildProcessSettingsLists.php b/app/adminapi/lists/build/BuildProcessSettingsLists.php index 0167b4c5d..275fdca59 100644 --- a/app/adminapi/lists/build/BuildProcessSettingsLists.php +++ b/app/adminapi/lists/build/BuildProcessSettingsLists.php @@ -56,7 +56,7 @@ class BuildProcessSettingsLists extends BaseAdminDataLists implements ListsSearc public function lists(): array { return BuildProcessSettings::where($this->searchWhere) - ->field(['id', 'division_id', 'process_step_no', 'process_step', 'file', 'quality_control_points']) + ->field(['id', 'division_id', 'process_step_no', 'process_step', 'annex', 'quality_control_points']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($item){ diff --git a/app/adminapi/logic/build/BuildProcessSettingsLogic.php b/app/adminapi/logic/build/BuildProcessSettingsLogic.php index 6b09277ee..bbfa1f9d8 100644 --- a/app/adminapi/logic/build/BuildProcessSettingsLogic.php +++ b/app/adminapi/logic/build/BuildProcessSettingsLogic.php @@ -47,7 +47,7 @@ class BuildProcessSettingsLogic extends BaseLogic 'process_step_no' => $params['process_step_no'], 'process_step' => $params['process_step'], 'quality_control_points' => $params['quality_control_points'], - 'file' => !empty($params['file']) ? json_encode($params['file']) : null, + 'annex' => !empty($params['annex']) ? json_encode($params['annex']) : null, 'add_user' => $admin_id, 'update_user' => $admin_id, ]); @@ -77,7 +77,7 @@ class BuildProcessSettingsLogic extends BaseLogic 'process_step_no' => $params['process_step_no'], 'process_step' => $params['process_step'], 'quality_control_points' => $params['quality_control_points'], - 'file' => !empty($params['file']) ? json_encode($params['file']) : null, + 'annex' => !empty($params['annex']) ? json_encode($params['annex']) : null, 'update_user' => $admin_id, 'update_time' => time(), ]); diff --git a/app/adminapi/validate/build/BuildProcessSettingsValidate.php b/app/adminapi/validate/build/BuildProcessSettingsValidate.php index d8d6d37b6..1d428ff5e 100644 --- a/app/adminapi/validate/build/BuildProcessSettingsValidate.php +++ b/app/adminapi/validate/build/BuildProcessSettingsValidate.php @@ -37,7 +37,7 @@ class BuildProcessSettingsValidate extends BaseValidate 'process_step_no' => 'require|integer|gt:0', 'process_step' => 'require', 'quality_control_points' => 'require', - 'file' => 'checkFile' + 'annex' => 'checkAnnex' ]; protected $message = [ @@ -122,7 +122,7 @@ class BuildProcessSettingsValidate extends BaseValidate return true; } - public function checkFile($value): bool|string + public function checkAnnex($value): bool|string { if(!empty($value) && $value != ''){ if(!is_array($value)){ diff --git a/app/common/model/build/BuildProcessSettings.php b/app/common/model/build/BuildProcessSettings.php index 69453531e..494d19698 100644 --- a/app/common/model/build/BuildProcessSettings.php +++ b/app/common/model/build/BuildProcessSettings.php @@ -30,7 +30,7 @@ class BuildProcessSettings extends BaseModel protected $name = 'build_process_settings'; protected $deleteTime = 'delete_time'; - public function getFileAttr($value) + public function getAnnexAttr($value) { return json_decode($value,true); }