Skip to content

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

调整测试sql语句

上级 739d041f
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 82 行删除
.gitignore
浏览文件 @ 25097aa1
......@@ -11,4 +11,5 @@
/LICENSE.txt
/phpinfo.php
/README.md
/think
\ No newline at end of file
/think
/config/database.php
\ No newline at end of file
.idea/workspace.xml
浏览文件 @ 25097aa1
......@@ -2,6 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
......@@ -15,20 +17,20 @@
</component>
<component name="FileEditorManager">
<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$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
<state relative-caret-position="434">
<caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
</state>
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="43" column="24" lean-forward="true" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
<state relative-caret-position="201">
<caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
</state>
</provider>
</entry>
......@@ -36,7 +38,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<state relative-caret-position="19592">
<caret line="655" column="45" selection-start-line="655" selection-start-column="40" selection-end-line="655" selection-end-column="45" />
</state>
</provider>
......@@ -45,7 +47,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/view/invoice/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<state relative-caret-position="1302">
<caret line="42" column="92" selection-start-line="42" selection-start-column="84" selection-end-line="42" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#input#0;n#div#1;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
......@@ -57,7 +59,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<state relative-caret-position="4619">
<caret line="149" column="32" selection-start-line="149" selection-start-column="25" selection-end-line="149" selection-end-column="32" />
</state>
</provider>
......@@ -66,8 +68,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="495">
<caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
<state relative-caret-position="2015">
<caret line="80" selection-start-line="80" selection-end-line="80" />
</state>
</provider>
</entry>
......@@ -108,9 +110,9 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/em/view/useage/special.html" />
<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$/.gitignore" />
</list>
</option>
</component>
......@@ -142,45 +144,12 @@
<expand>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="controller" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="view" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="view" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="invoice" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="route" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="config" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
</expand>
<select />
......@@ -191,7 +160,7 @@
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="E:/Jz-Php" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
......@@ -222,17 +191,18 @@
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="130000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="12462000" />
<option name="totallyTimeSpent" value="12592000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1512247" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15282215" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -245,7 +215,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.32934782" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.22173913" />
<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" />
......@@ -445,30 +415,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="12" column="61" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/common.php">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8587">
<caret line="277" column="29" selection-start-line="277" selection-start-column="29" selection-end-line="277" selection-end-column="29" />
<state relative-caret-position="19592">
<caret line="655" column="45" selection-start-line="655" selection-start-column="40" selection-end-line="655" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/invoice/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<state relative-caret-position="1302">
<caret line="42" column="92" selection-start-line="42" selection-start-column="84" selection-end-line="42" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#input#0;n#div#1;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
......@@ -478,29 +434,43 @@
</entry>
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<state relative-caret-position="4619">
<caret line="149" column="32" selection-start-line="149" selection-start-column="25" selection-end-line="149" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="655" column="45" selection-start-line="655" selection-start-column="40" selection-end-line="655" selection-end-column="45" />
<state relative-caret-position="2015">
<caret line="80" selection-start-line="80" selection-end-line="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<entry file="file://$PROJECT_DIR$/application/admin/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
<state relative-caret-position="341">
<caret line="12" column="61" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8587">
<caret line="277" column="29" selection-start-line="277" selection-start-column="29" selection-end-line="277" selection-end-column="29" />
</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="201">
<caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="43" column="24" lean-forward="true" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
<caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
</state>
</provider>
</entry>
......
application/em/model/EmInvoice.php
浏览文件 @ 25097aa1
......@@ -42,8 +42,7 @@ class EmInvoice extends Base
->page($Nowpage, $limits)
->select()
->toarray();
dd(self::getLastSql());
foreach ($data as &$item){
foreach ($data as &$item){
if($item['payment_balance'] == '') $item['payment_balance'] = 0;
$item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
if(is_int($item['settle_amount']) && $item['settle_balance']){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论