master public

app/JsonRpc/PublicRpcService.php

@@ -114,6 +114,7 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function getLetterOfComplaint(array $data = []): array
     {
+        var_dump("====");
         $where = [];
 
         if (isset($data['user_id']) && !empty($data['user_id'])) {
@@ -122,15 +123,11 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['nature']) && !empty($data['nature'])) {
             array_push($where, ['letter_of_complaint.nature', '=', $data['nature']]);
         }
-        if (isset($data['type']) && !empty($data['type'])) {
-            array_push($where, ['letter_of_complaint.type', '=', $data['type']]);
-        }
-        if (isset($data['nature_level']) && !empty($data['nature_level'])) {
-            array_push($where, ['letter_of_complaint.nature_level', '=', $data['nature_level']]);
-        }
-        if (isset($data['type_level']) && !empty($data['type_level'])) {
-            array_push($where, ['letter_of_complaint.type_level', '=', $data['type_level']]);
+
+        if (isset($data['nature_level0']) && !empty($data['nature_level0'])) {
+            array_push($where, ['letter_of_complaint.nature_level0', '=', $data['nature_level0']]);
         }
+
         if (isset($data['status']) && !empty($data['status'])) {
             array_push($where, ['letter_of_complaint.status', '=', $data['status']]);
         }
@@ -138,16 +135,17 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['pageSize'])) {
             $rep = LetterOfComplaint::where($where)
                 ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-                ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
-                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
+                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
+                ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
+                ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
                 ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-                ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
+
                 ->select("letter_of_complaint.*",
                     "type_a.type_name as nature_name",
-                    "type_b.type_name as type_name",
-                    "type_c.type_name as nature_level_name",
+                    "type_b.type_name as nature_name1",
+                    "type_c.type_name as nature_name0",
                     "type_d.type_name as status_name",
-                    "type_e.type_name as type_level_name")
+                    "type_e.type_name as nature_name3")
                 ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])->orderBy("letter_of_complaint.id", "desc")->get();
             $count = LetterOfComplaint::where($where)->count();
             if ($rep) {
@@ -173,16 +171,17 @@ class PublicRpcService implements PublicRpcServiceInterface
         } else {
             $result = LetterOfComplaint::where($where)
                 ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-                ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
-                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
+                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
+                ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
+                ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
                 ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-                ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
+
                 ->select("letter_of_complaint.*",
                     "type_a.type_name as nature_name",
-                    "type_b.type_name as type_name",
-                    "type_c.type_name as nature_level_name",
+                    "type_b.type_name as nature_name1",
+                    "type_c.type_name as nature_name0",
                     "type_d.type_name as status_name",
-                    "type_e.type_name as type_level_name")
+                    "type_e.type_name as nature_name3")
                 ->orderBy("letter_of_complaint.id", "desc")->get();
         }
         return $result ? Result::success($result) : Result::error("没有查到数据");
@@ -273,16 +272,17 @@ class PublicRpcService implements PublicRpcServiceInterface
         }
         $result = LetterOfComplaint::where($where)
             ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-            ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
-            ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
+            ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
+            ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
+            ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
             ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-            ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
+
             ->select("letter_of_complaint.*",
                 "type_a.type_name as nature_name",
-                "type_b.type_name as type_name",
-                "type_c.type_name as nature_level_name",
+                "type_b.type_name as nature_name1",
+                "type_c.type_name as nature_name0",
                 "type_d.type_name as status_name",
-                "type_e.type_name as type_level_name")
+                "type_e.type_name as nature_name3")
             ->first();
         return Result::success($result);
     }
@@ -316,10 +316,12 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['type'])) {
             array_push($where, ['type', '=', $data['type']]);
         }
-        $result = LetterType::where($where)->get();
+        if (isset($data['pid']) && $data['pid']>0) {
+            array_push($where, ['pid', '=', $data['pid']]);
+        }
+        $result = LetterType::where($where)->orderBy('sort','asc')->get();
         return $result ? Result::success($result) : Result::error("没有查到数据");
     }
-
     /**
      * 更新举报类型
      * @param array $data

app/Tools/Result.php

@@ -23,5 +23,4 @@ class Result
             'data' => $data,
         ];
     }
-    
 }