Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
Jz-Php
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
PHP
Jz-Php
Commits
422c16e4
提交
422c16e4
authored
1月 15, 2020
作者:
chengye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
调整账单查询条件
上级
6a23c437
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
8 行增加
和
8 行删除
+8
-8
workspace.xml
.idea/workspace.xml
+6
-6
Invoice.php
application/em/controller/Invoice.php
+2
-2
没有找到文件。
.idea/workspace.xml
浏览文件 @
422c16e4
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
<file
pinned=
"false"
current-in-tab=
"true"
>
<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=
"
415
"
>
<state
relative-caret-position=
"
322
"
>
<caret
line=
"6
8"
column=
"9"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"9"
selection-end-line=
"68"
selection-end-column=
"9
"
/>
<caret
line=
"6
5"
column=
"8"
selection-start-line=
"65"
selection-start-column=
"8"
selection-end-line=
"65"
selection-end-column=
"8
"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -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=
"31
06
000"
/>
<workItem
from=
"1579067299817"
duration=
"31
41
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"15
568
000"
/>
<option
name=
"totallyTimeSpent"
value=
"15
603
000"
/>
</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/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=
"
415
"
>
<state
relative-caret-position=
"
322
"
>
<caret
line=
"6
8"
column=
"9"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"9"
selection-end-line=
"68"
selection-end-column=
"9
"
/>
<caret
line=
"6
5"
column=
"8"
selection-start-line=
"65"
selection-start-column=
"8"
selection-end-line=
"65"
selection-end-column=
"8
"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
application/em/controller/Invoice.php
浏览文件 @
422c16e4
...
@@ -63,9 +63,9 @@ class Invoice extends Base
...
@@ -63,9 +63,9 @@ class Invoice extends Base
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'
=>
100
,
'data'
=>
$data
];
return
[
'code'
=>
0
,
'msg'
=>
''
,
'count'
=>
$InvoiceCount
,
'data'
=>
$data
];
}
}
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论