Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

+<?php
+
+namespace App\Console\Commands\MonthlyCount;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class InquiryMonthlyCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'yesterday_count';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '统计昨日数据';
+
+    /**
+     * @remark :询盘月报告
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/30 9:32
+     */
+    public function handle(){
+        // 获取上个月的开始时间
+        $startTime = Carbon::now()->subMonth()->startOfMonth();
+        // 获取上个月的结束时间
+        $endTime = Carbon::now()->subMonth()->endOfMonth();
+    }
+}

@@ -4,8 +4,6 @@ namespace App\Console\Commands\YesterdayCount;
 
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
-use App\Http\Logic\Aside\Project\ProjectLogic;
-use App\Models\CustomerVisit\CustomerVisitItem;
 use App\Models\Project\DeployBuild;
 use Carbon\Carbon;
 use Illuminate\Console\Command;

@@ -150,13 +150,13 @@ class BaseController extends Controller
             if (is_array($v)) {
                 $data[$k] = $this->_extents($v);
             } else {
-                if (is_null($v)) {
+                if (is_null($v) || empty($v)) {
                     $data[$k] = '';
                     continue;
                 }
                 switch ((string) $k) {
                     case 'image':
-                        $v['image_link'] = url('/a/image/' . $v);
+                        $data['image_link'] = url('/a/image/' . $v);
                         break;
                 }
             }

@@ -82,4 +82,16 @@ class ATemplateModuleController extends BaseController
         $ATemplateModuleLogic->aTemplateModuleDel();
         $this->response('success');
     }
+
+    /**
+     * @remark :获取所有模块类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/29 14:41
+     */
+    public function getType(ATemplateModuleLogic $ATemplateModuleLogic){
+        $list = $ATemplateModuleLogic->ModuleType($this->map);
+        $this->response('success',Code::SUCCESS,$list);
+    }
 }

@@ -22,7 +22,7 @@ class BTemplateModuleController extends BaseController
      * @time   :2023/6/29 11:33
      */
     public function lists(BTemplateModuleLogic $BTemplateModuleLogic){
-        $list = $BTemplateModuleLogic->ModuleList($this->map,$this->page,$this->row,$this->order);
+        $list = $BTemplateModuleLogic->ModuleList($this->map,$this->order);
         $this->response('success',Code::SUCCESS,$list);
     }
 

@@ -22,7 +22,7 @@ class ATemplateLogic extends BaseLogic
      * @method :post
      * @time   :2023/6/28 17:03
      */
-    public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['*']){
+    public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['id','name','status','deleted_status','sort','image']){
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
     }
@@ -93,7 +93,7 @@ class ATemplateLogic extends BaseLogic
         if($info !== false){
             $this->fail('当前模板有项目在使用，不允许删除');
         }
-        $rs = $this->model->edit(['deleted_status'=>$this->param['deleted_status'],'deleted_at'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
+        $rs = $this->model->edit(['deleted_status'=>1,'deleted_at'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('error');
         }

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Template;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Template\TemplateModule;
 use App\Models\Template\BSetting;
+use App\Models\Template\TemplateType;
 
 /**
  * @remark :左侧模块管理
@@ -82,4 +83,17 @@ class ATemplateModuleLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :获取所有模块类型
+     * @name   :ModuleType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/29 14:42
+     */
+    public function ModuleType($map){
+        $typeModel = new TemplateType();
+        $lists = $typeModel->list($map);
+        return $this->success($lists);
+    }
 }

@@ -22,8 +22,8 @@ class BTemplateModuleLogic extends BaseLogic
      * @method :post
      * @time   :2023/6/29 13:35
      */
-    public function ModuleList($map,$page,$row,$order = 'created_at',$filed = ['*']){
-        $lists = $this->model->lists($map,$page,$row,$order,$filed);
+    public function ModuleList($map,$order = 'created_at',$filed = ['*']){
+        $lists = $this->model->list($map,$order,$filed);
         return $this->success($lists);
     }
 

@@ -194,6 +194,31 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('files')->group(function () {
         Route::post('/upload', [\App\Http\Controllers\File\FileController::class, 'upload'])->name('files_upload');
     });
+//    // 公共主题模版
+//    Route::prefix('template')->group(function () {
+//        Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
+//        Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
+//        Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
+//        Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
+//
+//        // 左侧模块
+//        Route::prefix('module')->group(function () {
+//            Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
+//            Route::any('/save', [Aside\Template\ATemplateModuleController::class, 'save'])->name('admin.ATemplateModule_save');
+//            Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
+//            Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
+//            Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
+//        });
+//    });
+});
+
+//无需登录验证的路由组
+Route::group([], function () {
+    Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
+    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
+    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
+    Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
+    //放开模版上传
     // 公共主题模版
     Route::prefix('template')->group(function () {
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
@@ -207,17 +232,9 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/save', [Aside\Template\ATemplateModuleController::class, 'save'])->name('admin.ATemplateModule_save');
             Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
             Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
+            Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
         });
     });
 });
 
-//无需登录验证的路由组
-Route::group([], function () {
-    Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
-    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
-    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
-
-    Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
-});
-