Skip to content

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

test

上级 b330414c
显示空白字符变更
内嵌 并排
正在显示 包含 28 行增加 和 22 行删除
.idea/workspace.xml
浏览文件 @ 8aff41ce
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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$/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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -22,11 +25,11 @@ ...@@ -22,11 +25,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="213"> <state relative-caret-position="213">
<caret line="34" selection-start-line="34" selection-start-column="2" selection-end-line="37" selection-end-column="88" /> <caret line="31" column="34" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -61,11 +64,11 @@ ...@@ -61,11 +64,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="527"> <state relative-caret-position="299">
<caret line="65" column="49" lean-forward="true" selection-start-line="65" selection-start-column="49" selection-end-line="65" selection-end-column="49" /> <caret line="64" column="11" lean-forward="true" selection-start-line="64" selection-start-column="11" selection-end-line="64" selection-end-column="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -95,6 +98,7 @@ ...@@ -95,6 +98,7 @@
<find>last_date</find> <find>last_date</find>
<find>$sm</find> <find>$sm</find>
<find>/invoice</find> <find>/invoice</find>
<find>getInvoiceList</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -105,8 +109,8 @@ ...@@ -105,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>
...@@ -217,12 +221,12 @@ ...@@ -217,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="3673000" /> <workItem from="1578972376079" duration="3749000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9620000" /> <option name="totallyTimeSpent" value="9696000" />
</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" />
...@@ -486,17 +490,17 @@ ...@@ -486,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="527"> <state relative-caret-position="213">
<caret line="65" column="49" lean-forward="true" selection-start-line="65" selection-start-column="49" selection-end-line="65" selection-end-column="49" /> <caret line="31" column="34" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="34" />
</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="213"> <state relative-caret-position="299">
<caret line="34" selection-start-line="34" selection-start-column="2" selection-end-line="37" selection-end-column="88" /> <caret line="64" column="11" lean-forward="true" selection-start-line="64" selection-start-column="11" selection-end-line="64" selection-end-column="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/em/controller/Invoice.php
浏览文件 @ 8aff41ce
...@@ -60,9 +60,9 @@ class Invoice extends Base ...@@ -60,9 +60,9 @@ 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);
foreach ( $data as $key => &$v) { // foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']); // $v['status']=parseStatus($v['status']);
} // }
$InvoiceCount = (new EmInvoice)->getInvoiceCount($map); $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
if(Request::param('page')){ if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data]; return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
......
application/em/model/EmInvoice.php
浏览文件 @ 8aff41ce
...@@ -32,10 +32,12 @@ class EmInvoice extends Base ...@@ -32,10 +32,12 @@ 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'],'em.id=eu.em_id') ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
// ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_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) ->where($map)
->page($Nowpage, $limits) ->page($Nowpage, $limits)
->select() ->select()
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论