调整账单查询条件

.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="166">
-              <caret line="56" column="31" selection-start-line="56" selection-start-column="31" selection-end-line="56" selection-end-column="31" />
+            <state relative-caret-position="321">
+              <caret line="58" column="49" lean-forward="true" selection-start-line="58" selection-end-line="59" />
             </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="3918000" />
+      <workItem from="1579067299817" duration="5229000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16380000" />
+    <option name="totallyTimeSpent" value="17691000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -174,7 +174,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32608697" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.17934783" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -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="166">
-          <caret line="56" column="31" selection-start-line="56" selection-start-column="31" selection-end-line="56" selection-end-column="31" />
+        <state relative-caret-position="321">
+          <caret line="58" column="49" lean-forward="true" selection-start-line="58" selection-end-line="59" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -55,11 +55,10 @@ class EmInvoice extends Base
     public function getInvoiceCount($map){
         $data = self::alias('inv')
                 ->field('inv.*')
-//            ->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
+                ->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')
             ->count();
-//        dd($data);
         return $data;
     }
     //通过invoice_id查询列表数据