test

.idea/workspace.xml

@@ -3,8 +3,6 @@
   <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" />
-      <change beforePath="$PROJECT_DIR$/application/em/view/invoice/Invoice.php" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,11 +24,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <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="244">
-              <caret line="56" column="3" selection-start-line="56" selection-start-column="3" selection-end-line="67" selection-end-column="21" />
+            <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>
           </provider>
         </entry>
@@ -65,11 +63,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="310">
-              <caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" />
+            <state relative-caret-position="527">
+              <caret line="65" column="49" lean-forward="true" selection-start-line="65" selection-start-column="49" selection-end-line="65" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -109,8 +107,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>
@@ -221,18 +219,18 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="3459000" />
+      <workItem from="1578972376079" duration="3550000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9406000" />
+    <option name="totallyTimeSpent" value="9497000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1512247" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1512247" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -245,7 +243,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" visible="true" weight="0.051086955" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32934782" />
       <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" />
@@ -490,17 +488,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
+    <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="244">
-          <caret line="56" column="3" selection-start-line="56" selection-start-column="3" selection-end-line="67" selection-end-column="21" />
+        <state relative-caret-position="527">
+          <caret line="65" column="49" lean-forward="true" selection-start-line="65" selection-start-column="49" selection-end-line="65" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
+    <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" />
+        <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>
       </provider>
     </entry>

application/em/controller/Invoice.php

@@ -65,7 +65,7 @@ class Invoice extends Base
         }
         $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
         if(Request::param('page')){
-            return ['code'=>0,'msg'=>'','count'=>100,'data'=>$data];
+            return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
         }
 
         return $this->fetch();

application/em/model/EmInvoice.php

@@ -42,16 +42,16 @@ class EmInvoice extends Base
             ->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){