test

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/application/em/controller/Invoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/controller/Invoice.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/em/model/EmInvoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/model/EmInvoice.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,8 +28,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="61">
-              <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
+            <state relative-caret-position="340">
+              <caret line="39" column="2" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" />
             </state>
           </provider>
         </entry>
@@ -126,7 +126,7 @@
       <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="2227" />
     <option name="y" value="188" />
     <option name="width" value="1026" />
@@ -222,12 +222,12 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="5634000" />
+      <workItem from="1578972376079" duration="5733000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11581000" />
+    <option name="totallyTimeSpent" value="11680000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -500,8 +500,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="61">
-          <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
+        <state relative-caret-position="340">
+          <caret line="39" column="2" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -32,12 +32,12 @@ class EmInvoice extends Base
     public function getInvoiceList($map,$Nowpage,$limits){
         $data = self::alias('inv')
             ->field('inv.*')
-            ->field('station.station_name')
-            ->field('em.em_numb')
-            ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
-            ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
-            ->leftJoin(['em'],'em.id=eu.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
+//            ->field('station.station_name')
+//            ->field('em.em_numb')
+//            ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
+//            ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
+//            ->leftJoin(['em'],'em.id=eu.em_id')
+//            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
             ->where($map)
             ->page($Nowpage, $limits)
             ->select();