1

.idea/workspace.xml

@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/ProcessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/ProcessController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Service/ProcessService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/ProcessService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -155,7 +155,7 @@
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
       <workItem from="1686021203384" duration="14595000" />
-      <workItem from="1686099374239" duration="13709000" />
+      <workItem from="1686099374239" duration="15308000" />
     </task>
     <servers />
   </component>

app/Http/Controllers/Api/ProcessController.php

@@ -75,8 +75,6 @@ class ProcessController extends BaseController
 
     public function processList(Request $request)
     {
-
-
         $service = new ProcessService();
         $user = $request->get('auth');
         list($status,$data) = $service->processList($request->all(),$request->all());
@@ -86,13 +84,10 @@ class ProcessController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
     public function processEdit(Request $request)
     {
-
-
         $service = new ProcessService();
         $user = $request->get('auth');
         list($status,$data) = $service->processEdit($request->all(),$request->all());
@@ -102,13 +97,10 @@ class ProcessController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
     public function processAdd(Request $request)
     {
-
-
         $service = new ProcessService();
         $user = $request->get('auth');
         list($status,$data) = $service->processAdd($request->all(),$request->all());
@@ -118,13 +110,10 @@ class ProcessController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
     public function processDel(Request $request)
     {
-
-
         $service = new ProcessService();
         $user = $request->get('auth');
         list($status,$data) = $service->processDel($request->all(),$request->all());
@@ -134,6 +123,18 @@ class ProcessController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
+    }
+
+    public function processDetail(Request $request)
+    {
+        $service = new ProcessService();
+        $user = $request->get('auth');
+        list($status,$data) = $service->processDetail($request->all(),$request->all());
 
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
     }
 }

app/Service/ProcessService.php

@@ -34,7 +34,7 @@ class ProcessService extends Service
         if($this->isEmpty($data,'id')) return [false,'ID必须！'];
 
         BasicProcess::where('id',$data['id'])->update([
-            'del_time',time()
+            'del_time' => time()
         ]);
 
         return [true,'删除成功'];
@@ -137,8 +137,22 @@ class ProcessService extends Service
     }
 
     public function processList($data){
-        $list = Process::where('del_time',0)->select('*');
-        $list = $this->limit($list,'',$data);
+        $model = Process::where('del_time',0)->select('*');
+        if(! empty($data['p_id'])) {
+            $type = BasicProcess::where('del_time',0)
+                ->select('id','parent_id')
+                ->get()->toArray();
+            $this->getAllIdsArr($type,0,'',$ids);
+            $string = $this->getLongestStr($ids, $data['p_id']);
+            $pos = strpos($string, (string)$data['p_id']);
+            if ($pos !== false) $id = substr($string, $pos);
+            $res_id = [];
+            if(! empty($id)) $res_id = explode(',',$id);
+            $model->whereIn("p_id", $res_id);
+        }
+        if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
+
+        $list = $this->limit($model,'',$data);
 
         return [200,$list];
     }
@@ -149,4 +163,12 @@ class ProcessService extends Service
 
         return [true,''];
     }
+
+    public function processDetail($data){
+        if($this->isEmpty($data,'id')) return [false,'ID不能为空！'];
+        $first = Process::where('id',$data['id'])->select("*")->first();
+        if(empty($first)) return [true,[]];
+
+        return [true,$first->toArray()];
+    }
 }