Skip to content

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

test

上级 111541f6
显示空白字符变更
内嵌 并排
正在显示 包含 29 行增加 和 29 行删除
.idea/workspace.xml
浏览文件 @ a27f3582
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<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$/application/em/controller/Invoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/controller/Invoice.php" afterDir="false" /> <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> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -24,11 +25,11 @@ ...@@ -24,11 +25,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/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="120"> <state relative-caret-position="61">
<caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" /> <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -63,11 +64,11 @@ ...@@ -63,11 +64,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/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="217"> <state relative-caret-position="186">
<caret line="62" column="10" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" /> <caret line="61" column="41" selection-start-line="61" selection-start-column="41" selection-end-line="61" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -109,8 +110,8 @@ ...@@ -109,8 +110,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/model/EmInvoice.php" />
<option value="$PROJECT_DIR$/application/em/controller/Invoice.php" /> <option value="$PROJECT_DIR$/application/em/controller/Invoice.php" />
<option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -125,7 +126,7 @@ ...@@ -125,7 +126,7 @@
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" /> <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="2227" /> <option name="x" value="2227" />
<option name="y" value="188" /> <option name="y" value="188" />
<option name="width" value="1026" /> <option name="width" value="1026" />
...@@ -221,12 +222,12 @@ ...@@ -221,12 +222,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="5459000" /> <workItem from="1578972376079" duration="5634000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11406000" /> <option name="totallyTimeSpent" value="11581000" />
</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" />
...@@ -490,17 +491,17 @@ ...@@ -490,17 +491,17 @@
</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="120"> <state relative-caret-position="186">
<caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" /> <caret line="61" column="41" selection-start-line="61" selection-start-column="41" selection-end-line="61" selection-end-column="41" />
</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="217"> <state relative-caret-position="61">
<caret line="62" column="10" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" /> <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/em/controller/Invoice.php
浏览文件 @ a27f3582
...@@ -60,7 +60,6 @@ class Invoice extends Base ...@@ -60,7 +60,6 @@ class Invoice extends Base
$page =Request::param('page')?Request::param('page'):1; $page =Request::param('page')?Request::param('page'):1;
$limit = Request::param('limit')?Request::param('limit'):10; $limit = Request::param('limit')?Request::param('limit'):10;
$data = (new EmInvoice)->getInvoiceList($map,$page,$limit); $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
dd($data);
foreach ( $data as $key => &$v) { foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']); $v['status']=parseStatus($v['status']);
} }
......
application/em/model/EmInvoice.php
浏览文件 @ a27f3582
...@@ -40,18 +40,18 @@ class EmInvoice extends Base ...@@ -40,18 +40,18 @@ class EmInvoice extends Base
->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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论