修改账单统计

.idea/workspace.xml

@@ -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="279">
-              <caret line="63" column="22" lean-forward="true" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
+            <state relative-caret-position="306">
+              <caret line="61" column="22" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -131,12 +131,12 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="218000" />
+      <workItem from="1578972376079" duration="1072000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6165000" />
+    <option name="totallyTimeSpent" value="7019000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -155,7 +155,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 anchor="bottom" id="Terminal" order="10" weight="0.22203948" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.17269737" />
       <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" />
@@ -378,8 +378,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="63" column="22" lean-forward="true" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
+        <state relative-caret-position="306">
+          <caret line="61" column="22" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="22" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -56,12 +56,12 @@ class EmInvoice extends Base
     }
     public function getInvoiceCount($map){
         $data = self::alias('inv')
-            ->Join(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
-            ->Join(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
-            ->Join(['em'],'em.id=eu.em_id')
-            ->Join(['station_info'=>'station'],'station.station_id=em.station_id')
+            ->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)
-            ->count();
+            ->count('inv.*');
         return $data;
     }
     //通过invoice_id查询列表数据