test

.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" />
@@ -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="151">
-              <caret line="44" column="11" lean-forward="true" selection-start-line="44" selection-start-column="11" selection-end-line="53" selection-end-column="11" />
+            <state relative-caret-position="368">
+              <caret line="39" column="37" lean-forward="true" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -219,12 +219,12 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="3550000" />
+      <workItem from="1578972376079" duration="3619000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9497000" />
+    <option name="totallyTimeSpent" value="9566000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -497,8 +497,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="44" column="11" lean-forward="true" selection-start-line="44" selection-start-column="11" selection-end-line="53" selection-end-column="11" />
+        <state relative-caret-position="368">
+          <caret line="39" column="37" lean-forward="true" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
         </state>
       </provider>
     </entry>

application/em/model/EmInvoice.php

@@ -34,24 +34,22 @@ class EmInvoice extends Base
             ->field('inv.*')
             ->field('station.station_name')
             ->field('em.em_numb')
-            ->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)
             ->page($Nowpage, $limits)
             ->select()
             ->toarray();
-//         foreach ($data as &$item){
-//             if($item['payment_balance'] == '') $item['payment_balance'] = 0;
-//            $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
-//            if(is_int($item['settle_amount']) && $item['settle_balance']){
-//                if($item['settle_balance'] == '') $item['settle_balance'] = 0;
-//                $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance'];
-//            } else {
-//                $item['sett_amount'] = '';
-//            }
-//        }
+         foreach ($data as &$item){
+             if($item['payment_balance'] == '') $item['payment_balance'] = 0;
+            $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
+            if(is_int($item['settle_amount']) && $item['settle_balance']){
+                if($item['settle_balance'] == '') $item['settle_balance'] = 0;
+                $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance'];
+            } else {
+                $item['sett_amount'] = '';
+            }
+        }
         return $data;
     }
     public function getInvoiceCount($map){