分类修改

app/adminapi/controller/agricultural_machinery/AgriculturalMachineryCategoryController.php

@@ -38,6 +38,7 @@ class AgriculturalMachineryCategoryController extends BaseAdminController
      */
     public function lists()
     {
+        $params = (new AgriculturalMachineryServiceCategoryValidate())->get()->goCheck('list');
         return $this->dataLists(new AgriculturalMachineryCategoryLists());
     }
 
@@ -129,7 +130,8 @@ class AgriculturalMachineryCategoryController extends BaseAdminController
      */
     public function getValidCate()
     {
-        $result = AgriculturalMachineryServiceCategoryLogic::getValidCateData();
+        $params = (new AgriculturalMachineryServiceCategoryValidate())->get()->goCheck('list');
+        $result = AgriculturalMachineryServiceCategoryLogic::getValidCateData($params);
         return $this->data($result);
     }
 

app/adminapi/lists/agricultural_machinery/AgriculturalMachineryCategoryLists.php

@@ -37,7 +37,9 @@ class AgriculturalMachineryCategoryLists extends BaseAdminDataLists implements L
      */
     public function setSearch(): array
     {
-        return [];
+        return [
+            '=' => ['type']
+        ];
     }
 
     /**
@@ -70,6 +72,7 @@ class AgriculturalMachineryCategoryLists extends BaseAdminDataLists implements L
      */
     public function lists(): array
     {
+
         $ServerCateLists = AgriculturalMachineryServiceCategory::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order($this->sortOrder)

app/adminapi/logic/agricultural_machinery/AgriculturalMachineryServiceCategoryLogic.php

@@ -38,6 +38,7 @@ class AgriculturalMachineryServiceCategoryLogic extends BaseLogic
     {
         AgriculturalMachineryServiceCategory::create([
             'name' => $params['name'],
+            'type' => $params['type'],
             'status' => $params['status'] ?? 1,
             'sort' => $params['sort'] ?? 0
         ]);
@@ -117,13 +118,15 @@ class AgriculturalMachineryServiceCategoryLogic extends BaseLogic
      * @author 段誉
      * @date 2022/10/13 10:53
      */
-    public static function getValidCateData()
+    public static function getValidCateData($get)
     {
-        return AgriculturalMachineryServiceCategory::where(['status' => YesNoEnum::YES])
+
+        $list =  AgriculturalMachineryServiceCategory::where(['status' => YesNoEnum::YES,'type'=>$get['type']])
             ->field('id,name')
             ->order(['sort' => 'desc', 'id' => 'desc'])
             ->select()
             ->toArray();
+        return $list;
     }
 
 }

app/adminapi/validate/agricultural_machinery/AgriculturalMachineryServiceCategoryValidate.php

@@ -31,16 +31,30 @@ class AgriculturalMachineryServiceCategoryValidate extends BaseValidate
         'name' => 'require|length:1,60',
         'status' => 'require|in:0,1',
         'sort' => 'egt:0',
+        'type' =>'require|in:1,2,3',
     ];
 
     protected $message = [
-        'id.require' => ' 农耕分类id不能为空',
-        'name.require' => '农耕分类名称不能为空',
-        'name.length' => '农耕分类长度须在1-60位字符',
+        'id.require' => ' 分类id不能为空',
+        'name.require' => '分类名称不能为空',
+        'name.length' => '分类长度须在1-60位字符',
         'sort.egt' => '排序值不正确',
+        'type.require' => '类型不能为空',
+        'type.in' => '类型值type参数规则错误',
     ];
 
     /**
+     * @notes  列表
+     * @return ArticleCateValidate
+     * @author heshihu
+     * @date 2022/2/10 15:11
+     */
+    public function sceneList()
+    {
+        return $this->only(['type']);
+    }
+
+    /**
      * @notes  添加场景
      * @return ArticleCateValidate
      * @author heshihu
@@ -76,6 +90,8 @@ class AgriculturalMachineryServiceCategoryValidate extends BaseValidate
 
     public function sceneEdit()
     {
+        return $this
+        ->remove('type', 'require');
     }
 
     /**