调整账单查询条件

.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$/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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,8 +18,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="439">
-              <caret line="51" column="9" lean-forward="true" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="9" />
+            <state relative-caret-position="346">
+              <caret line="59" column="25" lean-forward="true" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -27,8 +27,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
+            <state relative-caret-position="229">
+              <caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" />
             </state>
           </provider>
         </entry>
@@ -52,8 +52,8 @@
       <list>
         <option value="$PROJECT_DIR$/application/em/view/useage/special.html" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
         <option value="$PROJECT_DIR$/application/em/controller/Invoice.php" />
+        <option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
       </list>
     </option>
   </component>
@@ -150,12 +150,12 @@
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
       <workItem from="1578972376079" duration="6515000" />
-      <workItem from="1579067299817" duration="3141000" />
+      <workItem from="1579067299817" duration="3251000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="15603000" />
+    <option name="totallyTimeSpent" value="15713000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -421,15 +421,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="51" column="9" lean-forward="true" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="9" />
+        <state relative-caret-position="346">
+          <caret line="59" column="25" lean-forward="true" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
+        <state relative-caret-position="229">
+          <caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -54,8 +54,6 @@ class EmInvoice extends Base
     }
     public function getInvoiceCount($map){
         $data = self::alias('inv')
-            ->field('inv.*')
-            ->field('station.station_name,em.em_numb')
             ->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')