合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3086

@@ -9,8 +9,12 @@
 
 namespace App\Http\Logic\Aside\Geo;
 
+use App\Console\Commands\Geo\GeoQuestionRes;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Geo\GeoConf;
+use App\Models\Geo\GeoLink;
+use App\Models\Geo\GeoQuestion;
+use App\Models\Geo\GeoWritings;
 use App\Models\Manage\ManageHr;
 use App\Models\Project\KeywordPrefix;
 use App\Models\Project\Project;
@@ -106,7 +110,11 @@ class GeoLogic extends BaseLogic
      */
     public function getCount()
     {
-
+        //获取问题数量
+        $geo_question_count = GeoQuestion::selectRaw('SUM(JSON_LENGTH(question)) as total_count')->value('total_count');
+        $geo_pr_count = GeoLink::where('project_id',$this->param['project_id'])->count();
+        $geo_writings_count = GeoWritings::where('project_id',$this->param['project_id'])->count();
+        return $this->success(['geo_writings_count'=>$geo_writings_count,'$geo_pr_count'=>$geo_pr_count,'geo_question_count'=>$geo_question_count]);
     }
 
 }

@@ -591,6 +591,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('conf')->group(function () {
             Route::any('/getConfig', [Aside\Geo\GeoController::class, 'getConfig'])->name('admin.geo_conf_getConfig');
             Route::any('/saveConfig', [Aside\Geo\GeoController::class, 'saveConfig'])->name('admin.geo_conf_saveConfig');
+            Route::any('/getCount', [Aside\Geo\GeoController::class, 'getCount'])->name('admin.geo_conf_getCount');
         });
         //geo客户确认信息
         Route::prefix('confirm')->group(function () {