diff --git a/app/dao/user/DistillationExpandWordDao.php b/app/dao/user/DistillationExpandWordDao.php deleted file mode 100644 index 4e9f8c4..0000000 --- a/app/dao/user/DistillationExpandWordDao.php +++ /dev/null @@ -1,17 +0,0 @@ -hasMany(DistillationTransWord::class, 'distillation_id', 'id'); } - public function expand() - { - return $this->hasMany(DistillationExpandWord::class, 'distillation_id', 'id'); - } - public function questions() { return $this->hasMany(DistillationQuestions::class, 'distillation_id', 'id')->where(['delete_time' => 0]); diff --git a/app/service/user/DataBoardService.php b/app/service/user/DataBoardService.php index de0f495..77e1292 100644 --- a/app/service/user/DataBoardService.php +++ b/app/service/user/DataBoardService.php @@ -2,19 +2,16 @@ namespace app\service\user; -use app\dao\user\DistillationExpandWordDao; use app\dao\user\DistillationWordDao; use plugin\piadmin\app\base\BaseService; class DataBoardService extends BaseService { protected $distillationWordDao; - protected $distillationWordExtendDao; public function __construct() { $this->distillationWordDao = app()->make(DistillationWordDao::class); - $this->distillationWordExtendDao = app()->make(DistillationExpandWordDao::class); } /** @@ -24,12 +21,12 @@ class DataBoardService extends BaseService */ public function countStatistic() { - $res = $this->distillationWordDao->getList([], '*', 0, 0, 'expand_count DESC', [], ['expand']); + $res = $this->distillationWordDao->getList([], '*', 0, 0, 'questions_count DESC', [], ['questions']); return [ 'word' => sizeof($res), - 'extend' => array_sum(array_column($res, 'expand_count')), - 'top' => collect($res)->sortByDesc('expand_count')->take(10)->map(function ($item) { - return collect($item)->only(['id', 'name', 'expand_count'])->toArray(); + 'extend' => array_sum(array_column($res, 'questions_count')), + 'top' => collect($res)->sortByDesc('questions_count')->take(10)->map(function ($item) { + return collect($item)->only(['id', 'name', 'questions_count'])->toArray(); })->toArray(), ]; } diff --git a/app/service/user/DistillationWordService.php b/app/service/user/DistillationWordService.php index c167394..62204c3 100644 --- a/app/service/user/DistillationWordService.php +++ b/app/service/user/DistillationWordService.php @@ -2,7 +2,6 @@ namespace app\service\user; -use app\dao\user\DistillationExpandWordDao; use app\dao\user\DistillationQuestionsDao; use app\dao\user\DistillationTransWordDao; use app\dao\user\DistillationWordDao; @@ -17,14 +16,12 @@ class DistillationWordService extends BaseService protected $dao; protected $transDao; - protected $expandDao; protected $questionsDao; public function __construct(DistillationWordDao $dao) { $this->dao = $dao; $this->transDao = app()->make(DistillationTransWordDao::class); - $this->expandDao = app()->make(DistillationExpandWordDao::class); $this->questionsDao = app()->make(DistillationQuestionsDao::class); } @@ -60,7 +57,7 @@ class DistillationWordService extends BaseService 'name' => $item ]; } - $this->expandDao->insertAll($expands); + $this->questionsDao->insertAll($expands); Db::commit(); } catch (\Exception $exception) { Db::rollback(); @@ -166,7 +163,6 @@ class DistillationWordService extends BaseService $this->dao->update([['id', 'in', $ids]], ['delete_time' => time()]); //删子表 $this->transDao->update([['distillation_id', 'in', $ids]], ['delete_time' => time()]); - $this->expandDao->update([['distillation_id', 'in', $ids]], ['delete_time' => time()]); $this->questionsDao->update([['distillation_id', 'in', $ids]], ['delete_time' => time()]); Db::commit(); } catch (\Exception $exception) {