调整账单查询条件

.idea/workspace.xml

@@ -27,8 +27,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="418">
-              <caret line="42" column="31" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
+            <state relative-caret-position="405">
+              <caret line="60" column="33" selection-start-line="60" selection-start-column="21" selection-end-line="60" selection-end-column="33" />
             </state>
           </provider>
         </entry>
@@ -189,12 +189,12 @@
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
       <workItem from="1578972376079" duration="6515000" />
-      <workItem from="1579067299817" duration="2262000" />
+      <workItem from="1579067299817" duration="2472000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14724000" />
+    <option name="totallyTimeSpent" value="14934000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -213,7 +213,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.26847827" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.31086957" />
       <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" />
@@ -467,8 +467,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="42" column="31" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
+        <state relative-caret-position="405">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="21" selection-end-line="60" selection-end-column="33" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -33,14 +33,13 @@ class EmInvoice extends Base
         $data = self::alias('inv')
             ->field('inv.*')
             ->field('station.station_name,em.em_numb')
-            ->leftJoin(['em_account'=>'ea'],'ea.account_id = inv.account_id')
-            ->leftJoin(['em'],'em.id=ea.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_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')
             ->where($map)
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
-        dd(self::getLastSql());
           foreach ($data as &$item){
              if($item['payment_balance'] == '') $item['payment_balance'] = 0;
             $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
@@ -57,9 +56,9 @@ class EmInvoice extends Base
         $data = self::alias('inv')
             ->field('inv.*')
             ->field('station.station_name,em.em_numb')
-            ->leftJoin(['em_account'=>'ea'],'ea.account_id = inv.account_id')
-            ->leftJoin(['em'],'em.id=ea.em_id')
-            ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_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')
             ->where($map)
             ->count();
         return $data;