diff --git a/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php b/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php index 0e5a0d7..38359d9 100644 --- a/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php +++ b/plugs/think-plugs-inspection/src/controller/api/auth/Ticket.php @@ -27,9 +27,7 @@ class Ticket extends Auth $ticket_region = $this->request->post('ticket_region'); $ticket_address = $this->request->post('ticket_address'); $imgs = $this->request->post('imgs'); - $ticket_project_use = $this->request->post('ticket_project_use'); $ticket_work_use = $this->request->post('ticket_work_use'); - $ticket_price =$this->request->post('ticket_price'); $data = [ 'uid' => $this->staff->id, 'utype' => $this->staff->id, diff --git a/plugs/think-plugs-inspection/src/model/InspectionRecord.php b/plugs/think-plugs-inspection/src/model/InspectionRecord.php index c8fbe5e..3dc797b 100644 --- a/plugs/think-plugs-inspection/src/model/InspectionRecord.php +++ b/plugs/think-plugs-inspection/src/model/InspectionRecord.php @@ -3,6 +3,7 @@ namespace plugin\inspection\model; use Cassandra\Date; +use plugin\ticket\model\TicketInspectionShare; use plugin\ticket\model\TicketTicket; use think\admin\Model; @@ -73,7 +74,7 @@ class InspectionRecord extends Model public function ticket() { - return $this->morphMany(TicketTicket::class, 'source'); + return $this->hasMany(TicketInspectionShare::class, 'record_id', 'id'); } } \ No newline at end of file diff --git a/plugs/think-plugs-ticket/src/model/TicketInspectionShare.php b/plugs/think-plugs-ticket/src/model/TicketInspectionShare.php new file mode 100644 index 0000000..07f2ee0 --- /dev/null +++ b/plugs/think-plugs-ticket/src/model/TicketInspectionShare.php @@ -0,0 +1,35 @@ +belongsTo(TicketType::class, 'type_id', 'id'); + } + + public function getTypeNameAttr($value, $data) + { + $type = $this->type()->find(); + if (!empty($type)) { + return $type['name']; + } else { + return '未知'; + } + } + + public function linkedTicket() + { + return $this->belongsTo(TicketTicket::class, 'linked_ticket_id', 'id'); + } + +} \ No newline at end of file