1

.gitignore

@@ -7,6 +7,7 @@ bin-release/
 # Other files and folders
 .settings/
 vendor
+vendor/
 public
 runtime
 runtime/
@@ -30,3 +31,4 @@ runtime/container/classes.cache
 runtime/container/scan.cache
 runtime
 /.env
+

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

runtime/hyperf.pid

@@ -1 +0,0 @@
-1874

runtime/logs/hyperf.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <<<<<<< HEAD
  [2024-10-24T02:01:08.461639+00:00] sql.INFO: [298.43] select count(*) as aggregate from `department` [] []
 [2024-10-24T02:01:08.487681+00:00] sql.INFO: [25.45] select * from `department` limit 10 offset 0 [] []
@@ -7785,3 +7786,8 @@
 [2024-11-09T09:41:25.653452+00:00] sql.INFO: [3.99] select count(*) as aggregate from `website` [] []
 [2024-11-09T09:41:25.659283+00:00] sql.INFO: [25.79] select * from `district` where (`pid` = '0') order by `code` asc [] []
 >>>>>>> news_10_8_liu
+=======
+[2024-11-21T07:56:29.674152+00:00] sql.INFO: [87.21] select * from `letter_type` where (`type` = '1') order by `sort` asc [] []
+[2024-11-21T07:56:40.645759+00:00] sql.INFO: [18.18] select * from `letter_type` where (`type` = '1' and `pid` = '14') order by `sort` asc [] []
+[2024-11-21T07:56:56.646094+00:00] sql.INFO: [103.6] insert into `letter_of_complaint` (`title`, `nature`, `nature_level0`, `nature_level1`, `nature_level3`, `name`, `id_card`, `mobile`, `describe`, `like_remark`, `judgment`, `audio_and_video`, `contract`, `qualifications`, `money`, `other`, `user_id`) values ('我测试一条', '5', '14', '29', '113', '1', '1', '15801245755', '111', '111111111', '', '', '', '', '1', '111', '71') [] []
+>>>>>>> chat_11_21_liu

vendor/composer/installed.php

@@ -4,7 +4,6 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
         'reference' => 'c4c92ee3483e1c5bcad652be05a02e5b2587a966',
-
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -441,7 +440,10 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
             'reference' => 'c4c92ee3483e1c5bcad652be05a02e5b2587a966',
+<<<<<<< HEAD
 
+=======
+>>>>>>> chat_11_21_liu
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),