From c196830fe1da374111ddc4ffc90c036e339a36ff Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Wed, 4 Oct 2023 17:46:09 +0900 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E8=A8=BC=E6=98=8E=E8=A8=BC=E7=94=BB?= =?UTF-8?q?=E5=83=8F=E3=81=AE=E6=9C=89=E5=8A=B9=E6=9C=9F=E9=99=90=E5=85=A5?= =?UTF-8?q?=E5=8A=9B=E3=80=80=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UploadOtherLicenseImagesController.php | 1 + .../SeasonTicketContract/UploadOtherLicenseImagesParam.php | 3 +++ .../UploadStudentLicenseImagesController.php | 1 + .../UploadStudentLicenseImagesParam.php | 7 +++++-- app/Kintone/Models/KintoneModel.php | 2 +- app/Kintone/Models/SeasonTicketContract.php | 4 ++++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php index a68d540..cfc64d0 100644 --- a/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php @@ -44,6 +44,7 @@ class UploadOtherLicenseImagesController extends WebController $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES, $data); $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); + $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_EXPIRES_DATE, $param->expiresAt); $access->update($seasonTicketContract); return $this->successResponse(); diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php index 160003c..54abf4c 100644 --- a/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php @@ -4,10 +4,12 @@ namespace App\Http\Controllers\Web\SeasonTicketContract; use App\Http\Controllers\Web\BaseParam; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Carbon; /** * @property UploadedFile[] $images * @property string $seasonTicketContractRecordNo + * @property Carbon expiresAt */ class UploadOtherLicenseImagesParam extends BaseParam { @@ -15,6 +17,7 @@ class UploadOtherLicenseImagesParam extends BaseParam { return [ 'season_ticket_contract_record_no' => $this->str(), + 'expires_at' => $this->date(), ...$this->images('images') ]; } diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php index f0afe7a..428bab9 100644 --- a/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php @@ -46,6 +46,7 @@ class UploadStudentLicenseImagesController extends WebController $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES, $data); $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); + $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_EXPIRES_DATE, $param->expiresAt); $access->update($seasonTicketContract); return $this->successResponse(); diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php index 59d434e..f30fe1d 100644 --- a/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php @@ -4,10 +4,12 @@ namespace App\Http\Controllers\Web\SeasonTicketContract; use App\Http\Controllers\Web\BaseParam; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Carbon; /** - * @property UploadedFile[] $images - * @property string $seasonTicketContractRecordNo + * @property UploadedFile[] images + * @property string seasonTicketContractRecordNo + * @property Carbon expiresAt */ class UploadStudentLicenseImagesParam extends BaseParam { @@ -15,6 +17,7 @@ class UploadStudentLicenseImagesParam extends BaseParam { return [ 'season_ticket_contract_record_no' => $this->str(), + 'expires_at' => $this->date(), ...$this->images('images') ]; } diff --git a/app/Kintone/Models/KintoneModel.php b/app/Kintone/Models/KintoneModel.php index 6991edd..7f97dc2 100644 --- a/app/Kintone/Models/KintoneModel.php +++ b/app/Kintone/Models/KintoneModel.php @@ -401,7 +401,7 @@ abstract class KintoneModel if ($type === FieldType::DATETIME) { if ($value instanceof Carbon) { - $ret[$columnName] = $value->format('Y/m/d H:i:s'); + $ret[$columnName] = $value->format('Y/m/d H:i'); } else { $ret[$columnName] = $value; } diff --git a/app/Kintone/Models/SeasonTicketContract.php b/app/Kintone/Models/SeasonTicketContract.php index 7451bbd..ce12e34 100644 --- a/app/Kintone/Models/SeasonTicketContract.php +++ b/app/Kintone/Models/SeasonTicketContract.php @@ -30,6 +30,8 @@ class SeasonTicketContract extends KintoneModel const FIELD_OTHER_LICENSE_IMAGES = "障がい者手帳画像"; const FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME = "学生証画像更新日時"; const FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME = "障がい者手帳画像更新日時"; + const FIELD_STUDENT_LICENSE_EXPIRES_DATE = "学生証有効期限"; + const FIELD_OTHER_LICENSE_EXPIRES_DATE = "障がい者手帳有効期限"; protected const FIELDS = [ ...parent::FIELDS, @@ -46,6 +48,8 @@ class SeasonTicketContract extends KintoneModel self::FIELD_OTHER_LICENSE_IMAGES => FieldType::FILE, self::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, self::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, + self::FIELD_STUDENT_LICENSE_EXPIRES_DATE => FieldType::DATE, + self::FIELD_OTHER_LICENSE_EXPIRES_DATE => FieldType::DATE, ]; protected const FIELD_NAMES = [