瀏覽代碼

修改查询矿区列表接口

qiuzijian 4 年之前
父節點
當前提交
834a515fa9
共有 2 個文件被更改,包括 28 次插入26 次删除
  1. 22 22
      .idea/workspace.xml
  2. 6 4
      Modules/Mine/Services/MineServices.php

+ 22 - 22
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
     </list>
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
@@ -58,11 +58,11 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="550">
-              <caret line="62" column="11" lean-forward="true" selection-start-line="58" selection-start-column="10" selection-end-line="62" selection-end-column="11" />
+            <state relative-caret-position="356">
+              <caret line="52" column="21" lean-forward="true" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
               <folding>
               <folding>
                 <element signature="e#139#160#0#PHP" expanded="true" />
                 <element signature="e#139#160#0#PHP" expanded="true" />
               </folding>
               </folding>
@@ -94,11 +94,11 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="497">
-              <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
+            <state relative-caret-position="610">
+              <caret line="94" column="9" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" />
               <folding>
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
               </folding>
@@ -210,9 +210,9 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -447,12 +447,12 @@
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="193710000" />
+      <workItem from="1618368497550" duration="194856000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="193853000" />
+    <option name="totallyTimeSpent" value="194999000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -798,16 +798,6 @@
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log">
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="497">
-          <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
-          <folding>
-            <element signature="e#127#148#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
     <entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="571">
         <state relative-caret-position="571">
@@ -840,13 +830,23 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="62" column="11" lean-forward="true" selection-start-line="58" selection-start-column="10" selection-end-line="62" selection-end-column="11" />
+        <state relative-caret-position="356">
+          <caret line="52" column="21" lean-forward="true" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
           <folding>
           <folding>
             <element signature="e#139#160#0#PHP" expanded="true" />
             <element signature="e#139#160#0#PHP" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="610">
+          <caret line="94" column="9" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" />
+          <folding>
+            <element signature="e#127#148#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
 </project>
 </project>

+ 6 - 4
Modules/Mine/Services/MineServices.php

@@ -83,15 +83,17 @@ class MineServices{
 
 
         if ($mine_code) {
         if ($mine_code) {
             $mine_id = MineList::where('slug', 'like', '%' . $mine_code . '%')->where('parent_id', 0)->value('id');
             $mine_id = MineList::where('slug', 'like', '%' . $mine_code . '%')->where('parent_id', 0)->value('id');
+            $mine_one = [];
             foreach ($mine_list as $key => $val) {
             foreach ($mine_list as $key => $val) {
-                if ($val['mine_id'] != $mine_id) {
-                    unset($mine_list[$key]);
+                if ($val['mine_id'] == $mine_id) {
+                    $mine_one[] = $val;
                 }
                 }
             }
             }
+            $result['data'] = $mine_one;
+        } else {
+            $result['data'] = $mine_list;
         }
         }
 
 
-        $result['data'] = $mine_list;
-
         return $result;
         return $result;
     }
     }