Skip to content

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

调整账单查询条件

上级 790d6797
显示空白字符变更
内嵌 并排
正在显示 包含 23 行增加 和 22 行删除
.idea/workspace.xml
浏览文件 @ 3be5c05d
......@@ -2,6 +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" />
......@@ -18,8 +19,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="439">
<caret line="62" column="25" selection-start-line="62" selection-start-column="25" selection-end-line="62" selection-end-column="25" />
<state relative-caret-position="394">
<caret line="60" column="18" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="18" />
</state>
</provider>
</entry>
......@@ -27,8 +28,8 @@
<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="229">
<caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" />
<state relative-caret-position="384">
<caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
</state>
</provider>
</entry>
......@@ -68,11 +69,11 @@
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2227" />
<option name="y" value="188" />
<option name="width" value="1026" />
<option name="height" value="546" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="1961" />
<option name="y" value="18" />
<option name="width" value="1222" />
<option name="height" value="821" />
</component>
<component name="ProjectView">
<navigator currentView="Scope" currentSubView="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope" proportions="" version="1">
......@@ -150,12 +151,12 @@
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="3559000" />
<workItem from="1579067299817" duration="3722000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16021000" />
<option name="totallyTimeSpent" value="16184000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
......@@ -174,7 +175,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 active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.31086957" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.69756097" />
<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" />
......@@ -421,15 +422,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" />
<state relative-caret-position="384">
<caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="439">
<caret line="62" column="25" selection-start-line="62" selection-start-column="25" selection-end-line="62" selection-end-column="25" />
<state relative-caret-position="394">
<caret line="60" column="18" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="18" />
</state>
</provider>
</entry>
......
application/em/controller/Invoice.php
浏览文件 @ 3be5c05d
......@@ -59,11 +59,13 @@ class Invoice extends Base
}
$page =Request::param('page')?Request::param('page'):1;
$limit = Request::param('limit')?Request::param('limit'):10;
$data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
$emInvModel = new EmInvoice;
$data = $emInvModel->getInvoiceList($map,$page,$limit);
foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']);
}
$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
$InvoiceCount = $emInvModel->getInvoiceCount($map);
if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
}
......
application/em/model/EmInvoice.php
浏览文件 @ 3be5c05d
......@@ -57,10 +57,8 @@ class EmInvoice extends Base
->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
->join(['em'],'em.id=ea.em_id')
->join(['station_info'=>'station'],'station.station_id=em.station_id')
->where($map)
->select();
dd(count($data));
->count();
dd($data);
return $data;
}
//通过invoice_id查询列表数据
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论