Merge remote-tracking branch 'origin/master' into akun

@@ -66,7 +66,7 @@ class ExtensionModuleController extends BaseController
             'module_id.required' => '模块id不能为空',
             'module_id.required' => '模块id不能为空',
         ]);
         ]);
         $moduleFieldModel = new ExtensionModuleField();
         $moduleFieldModel = new ExtensionModuleField();
-        $list = $moduleFieldModel->list(['module_id'=>$this->param['module_id']],'sort');
+        $list = $moduleFieldModel->list(['module_id'=>$this->param['module_id']],'sort',['*'],'desc');
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
             $v['is_use'] = 0;
             $v['is_use'] = 0;
@@ -136,12 +136,25 @@ class ExtensionModuleController extends BaseController
         ],[
         ],[
             'module_id.required' => '模块id不能为空',
             'module_id.required' => '模块id不能为空',
         ]);
         ]);
+        $searchParam = [
+            'module_id'=>$this->param['module_id'],
+        ];
         $data = [];
         $data = [];
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
-        $lists = $moduleValueModel->list(['module_id'=>$this->param['module_id']]);
+        if(isset($this->param['field_id']) && ($this->param['field_id'] != 0) && isset($this->param['value'])){
+            $uuidArr = $moduleValueModel->formatQuery(['field_id'=>$this->param['field_id'],'value'=>$this->param['value'],'module_id'=>$this->param['module_id']])->distinct()->pluck('uuid')->toArray();
+            if(!empty($uuidArr)){
+                $searchParam['uuid'] = ['in',$uuidArr];
+            }
+        }
+        if(isset($this->param['start_time']) && !empty($this->param['start_time']) && isset($this->param['end_time']) && !empty($this->param['end_time'])){
+            $searchParam['created_at'] = ['between',[$this->param['start_time'],$this->param['end_time']]];
+        }
+        $lists = $moduleValueModel->list($searchParam);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 $data[$v['uuid']][$v['field_id']] = $v['value'];
                 $data[$v['uuid']][$v['field_id']] = $v['value'];
+                $data[$v['uuid']]['created_at'] = $v['created_at'];
             }
             }
         }
         }
         $resultData = [];
         $resultData = [];
@@ -286,7 +299,33 @@ class ExtensionModuleController extends BaseController
      */
      */
     public function setSort(){
     public function setSort(){
         $moduleFieldModel = new ExtensionModuleField();
         $moduleFieldModel = new ExtensionModuleField();
-        $moduleFieldModel->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        $num = 100;
+        foreach ($this->param['id'] as $id){
+            $moduleFieldModel->edit(['sort'=>$num],['id'=>$id]);
+            $num--;
+        }
+        $this->response('success');
+    }
+
+    /**
+     * @remark :设置搜索参数
+     * @name   :setSearchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/23 16:24
+     */
+    public function setSearchParam(){
+        $this->request->validate([
+            'module_id'=>'required',
+            'id'=>'required|array'
+        ],[
+            'module_id.required' => '模块id不能为空',
+            'id.required'=>'id不能为空',
+            'id.array'=>'id是一个数组'
+        ]);
+        $moduleFieldModel = new ExtensionModuleField();
+        $moduleFieldModel->edit(['is_search'=>0],['module_id'=>$this->param['module_id']]);
+        $moduleFieldModel->edit(['is_search'=>1],['id'=>['in',$this->param['id']]]);
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }

@@ -586,6 +586,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/sendUniqueStr', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'sendUniqueStr'])->name('extension_module_sendUniqueStr');
         Route::any('/sendUniqueStr', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'sendUniqueStr'])->name('extension_module_sendUniqueStr');
         Route::any('/getFieldType', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'getFieldType'])->name('extension_module_getFieldType');
         Route::any('/getFieldType', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'getFieldType'])->name('extension_module_getFieldType');
         Route::any('/setSort', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSort'])->name('extension_module_setSort');
         Route::any('/setSort', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSort'])->name('extension_module_setSort');
+        Route::any('/setSearchParam', [\App\Http\Controllers\Bside\ExtensionModule\ExtensionModuleController::class, 'setSearchParam'])->name('extension_module_setSearchParam');
     });
     });
 
 
     //自定义小语种文本信息
     //自定义小语种文本信息