Skip to content

J
Jz-Php
提交 2209d54d authored 作者: chengye's avatar chengye
浏览文件
操作

test

上级 62d8bd2a
显示空白字符变更
内嵌 并排
正在显示 包含 32 行增加 和 33 行删除
.idea/workspace.xml
浏览文件 @ 2209d54d
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment=""> <list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/model/EmInvoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/model/EmInvoice.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -25,11 +24,11 @@ ...@@ -25,11 +24,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="186">
<caret line="39" column="2" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" /> <caret line="44" column="9" selection-start-line="44" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -64,11 +63,11 @@ ...@@ -64,11 +63,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="92">
<caret line="61" column="41" selection-start-line="61" selection-start-column="41" selection-end-line="61" selection-end-column="41" /> <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -110,8 +109,8 @@ ...@@ -110,8 +109,8 @@
<list> <list>
<option value="$PROJECT_DIR$/application/em/view/useage/special.html" /> <option value="$PROJECT_DIR$/application/em/view/useage/special.html" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/application/em/controller/Invoice.php" />
<option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" /> <option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
<option value="$PROJECT_DIR$/application/em/controller/Invoice.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -222,12 +221,12 @@ ...@@ -222,12 +221,12 @@
<workItem from="1578817951649" duration="618000" /> <workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="5097000" /> <workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="5733000" /> <workItem from="1578972376079" duration="5851000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11680000" /> <option name="totallyTimeSpent" value="11798000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" /> <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
...@@ -491,17 +490,17 @@ ...@@ -491,17 +490,17 @@
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="61" column="41" selection-start-line="61" selection-start-column="41" selection-end-line="61" selection-end-column="41" /> <caret line="44" column="9" selection-start-line="44" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="92">
<caret line="39" column="2" selection-start-line="39" selection-start-column="2" selection-end-line="39" selection-end-column="2" /> <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/em/model/EmInvoice.php
浏览文件 @ 2209d54d
...@@ -32,26 +32,26 @@ class EmInvoice extends Base ...@@ -32,26 +32,26 @@ class EmInvoice extends Base
public function getInvoiceList($map,$Nowpage,$limits){ public function getInvoiceList($map,$Nowpage,$limits){
$data = self::alias('inv') $data = self::alias('inv')
->field('inv.*') ->field('inv.*')
// ->field('station.station_name') ->field('station.station_name')
// ->field('em.em_numb') ->field('em.em_numb')
// ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id') ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
// ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id') ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
// ->leftJoin(['em'],'em.id=eu.em_id') ->leftJoin(['em'],'em.id=eu.em_id')
// ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id') ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->where($map) ->where($map)
->page($Nowpage, $limits) ->page($Nowpage, $limits)
->select(); ->select()
// ->toarray(); ->toarray();
// foreach ($data as &$item){ foreach ($data as &$item){
// if($item['payment_balance'] == '') $item['payment_balance'] = 0; if($item['payment_balance'] == '') $item['payment_balance'] = 0;
// $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance']; $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
// if(is_int($item['settle_amount']) && $item['settle_balance']){ if(is_int($item['settle_amount']) && $item['settle_balance']){
// if($item['settle_balance'] == '') $item['settle_balance'] = 0; if($item['settle_balance'] == '') $item['settle_balance'] = 0;
// $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance']; $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance'];
// } else { } else {
// $item['sett_amount'] = ''; $item['sett_amount'] = '';
// } }
// } }
return $data; return $data;
} }
public function getInvoiceCount($map){ public function getInvoiceCount($map){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论