提交 1db629c9 authored 作者: chengye's avatar chengye

调整账单查询条件

上级 c9283204
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="346"> <state relative-caret-position="408">
<caret line="59" column="25" lean-forward="true" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" /> <caret line="61" column="31" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="31" />
</state> </state>
</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="229"> <state relative-caret-position="229">
...@@ -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="3251000" /> <workItem from="1579067299817" duration="3332000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15713000" /> <option name="totallyTimeSpent" value="15794000" />
</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" />
...@@ -419,17 +419,17 @@ ...@@ -419,17 +419,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="346"> <state relative-caret-position="229">
<caret line="59" column="25" lean-forward="true" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" /> <caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" />
</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="229"> <state relative-caret-position="408">
<caret line="65" column="61" selection-start-line="65" selection-start-column="57" selection-end-line="65" selection-end-column="61" /> <caret line="61" column="31" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="31" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -59,6 +59,7 @@ class EmInvoice extends Base ...@@ -59,6 +59,7 @@ class EmInvoice extends Base
->join(['station_info'=>'station'],'station.station_id=em.station_id') ->join(['station_info'=>'station'],'station.station_id=em.station_id')
->where($map) ->where($map)
->count(); ->count();
dd(self::getLastSql());
return $data; return $data;
} }
//通过invoice_id查询列表数据 //通过invoice_id查询列表数据
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论