调整账单查询条件

.idea/workspace.xml

@@ -18,8 +18,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="321">
-              <caret line="58" column="49" lean-forward="true" selection-start-line="58" selection-end-line="59" />
+            <state relative-caret-position="383">
+              <caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -150,12 +150,12 @@
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
       <workItem from="1578972376079" duration="6515000" />
-      <workItem from="1579067299817" duration="5229000" />
+      <workItem from="1579067299817" duration="5750000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17691000" />
+    <option name="totallyTimeSpent" value="18212000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -428,8 +428,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="58" column="49" lean-forward="true" selection-start-line="58" selection-end-line="59" />
+        <state relative-caret-position="383">
+          <caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -56,8 +56,8 @@ class EmInvoice extends Base
         $data = self::alias('inv')
                 ->field('inv.*')
                 ->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
-//                ->join(['em'],'em.id=ea.em_id')
-//            ->join(['station_info'=>'station'],'station.station_id=em.station_id')
+                ->join(['em'],'em.id=ea.em_id')
+                ->join(['station_info'=>'station'],'station.station_id=em.station_id')
             ->count();
         return $data;
     }