mirror of
https://gitee.com/koogua/course-tencent-cloud.git
synced 2025-06-25 12:09:09 +08:00
移除consult中多余的chapter_id属性
This commit is contained in:
parent
56f66c01bd
commit
fba681a4b5
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
namespace App\Builders;
|
namespace App\Builders;
|
||||||
|
|
||||||
use App\Repos\Chapter as ChapterRepo;
|
|
||||||
use App\Repos\Course as CourseRepo;
|
use App\Repos\Course as CourseRepo;
|
||||||
use App\Repos\User as UserRepo;
|
use App\Repos\User as UserRepo;
|
||||||
|
|
||||||
@ -54,23 +53,6 @@ class ConsultList extends Builder
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getChapters(array $consults)
|
|
||||||
{
|
|
||||||
$ids = kg_array_column($consults, 'chapter_id');
|
|
||||||
|
|
||||||
$chapterRepo = new ChapterRepo();
|
|
||||||
|
|
||||||
$chapters = $chapterRepo->findByIds($ids, ['id', 'title']);
|
|
||||||
|
|
||||||
$result = [];
|
|
||||||
|
|
||||||
foreach ($chapters->toArray() as $chapter) {
|
|
||||||
$result[$chapter['id']] = $chapter;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getUsers(array $consults)
|
public function getUsers(array $consults)
|
||||||
{
|
{
|
||||||
$ownerIds = kg_array_column($consults, 'owner_id');
|
$ownerIds = kg_array_column($consults, 'owner_id');
|
||||||
|
@ -5,18 +5,10 @@
|
|||||||
{% set update_url = url({'for':'home.consult.reply','id':consult.id}) %}
|
{% set update_url = url({'for':'home.consult.reply','id':consult.id}) %}
|
||||||
|
|
||||||
<form class="layui-form consult-form" method="post" action="{{ update_url }}">
|
<form class="layui-form consult-form" method="post" action="{{ update_url }}">
|
||||||
{% if consult.course.id is defined %}
|
<div class="layui-form-item mb0">
|
||||||
<div class="layui-form-item mb0">
|
<label class="layui-form-label">课程</label>
|
||||||
<label class="layui-form-label">课程</label>
|
<div class="layui-form-mid">{{ consult.course.title }}</div>
|
||||||
<div class="layui-form-mid">{{ consult.course.title }}</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if consult.chapter.id is defined %}
|
|
||||||
<div class="layui-form-item mb0">
|
|
||||||
<label class="layui-form-label">章节</label>
|
|
||||||
<div class="layui-form-mid">{{ consult.chapter.title }}</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<label class="layui-form-label">问题</label>
|
<label class="layui-form-label">问题</label>
|
||||||
<div class="layui-form-mid">{{ consult.question }}</div>
|
<div class="layui-form-mid">{{ consult.question }}</div>
|
||||||
|
@ -40,13 +40,6 @@ class Consult extends Model
|
|||||||
*/
|
*/
|
||||||
public $course_id = 0;
|
public $course_id = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* 章节编号
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
public $chapter_id = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提主编号
|
* 提主编号
|
||||||
*
|
*
|
||||||
|
@ -48,14 +48,12 @@ class ConsultList extends LogicService
|
|||||||
$consults = $pager->items->toArray();
|
$consults = $pager->items->toArray();
|
||||||
|
|
||||||
$courses = $builder->getCourses($consults);
|
$courses = $builder->getCourses($consults);
|
||||||
$chapters = $builder->getChapters($consults);
|
|
||||||
|
|
||||||
$items = [];
|
$items = [];
|
||||||
|
|
||||||
foreach ($consults as $consult) {
|
foreach ($consults as $consult) {
|
||||||
|
|
||||||
$course = $courses[$consult['course_id']] ?? new \stdClass();
|
$course = $courses[$consult['course_id']] ?? new \stdClass();
|
||||||
$chapter = $chapters[$consult['chapter_id']] ?? new \stdClass();
|
|
||||||
|
|
||||||
$items[] = [
|
$items[] = [
|
||||||
'id' => $consult['id'],
|
'id' => $consult['id'],
|
||||||
@ -66,7 +64,6 @@ class ConsultList extends LogicService
|
|||||||
'reply_time' => $consult['reply_time'],
|
'reply_time' => $consult['reply_time'],
|
||||||
'create_time' => $consult['create_time'],
|
'create_time' => $consult['create_time'],
|
||||||
'course' => $course,
|
'course' => $course,
|
||||||
'chapter' => $chapter,
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user