提交 b0bc8884 authored 作者: chengye's avatar chengye

调整账单查询条件

上级 2977a66a
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<file pinned="false" current-in-tab="true"> <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="383"> <state relative-caret-position="352">
<caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" /> <caret line="62" column="16" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,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="2078" /> <option name="x" value="2078" />
<option name="y" value="-22" /> <option name="y" value="-22" />
<option name="width" value="1222" /> <option name="width" value="1222" />
...@@ -150,12 +150,12 @@ ...@@ -150,12 +150,12 @@
<workItem from="1578900535997" duration="5097000" /> <workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" /> <workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="5750000" /> <workItem from="1579067299817" duration="5879000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="18212000" /> <option name="totallyTimeSpent" value="18341000" />
</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" />
...@@ -428,8 +428,8 @@ ...@@ -428,8 +428,8 @@
</entry> </entry>
<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="383"> <state relative-caret-position="352">
<caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" /> <caret line="62" column="16" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -58,6 +58,7 @@ class EmInvoice extends Base ...@@ -58,6 +58,7 @@ class EmInvoice extends Base
->join(['em_account'=>'ea'],'ea.account_id = inv.account_id') ->join(['em_account'=>'ea'],'ea.account_id = inv.account_id')
->join(['em'],'em.id=ea.em_id') ->join(['em'],'em.id=ea.em_id')
->join(['station_info'=>'station'],'station.station_id=em.station_id') ->join(['station_info'=>'station'],'station.station_id=em.station_id')
->where($map)
->count(); ->count();
return $data; return $data;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论