Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
Jz-Php
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
PHP
Jz-Php
Commits
b330414c
提交
b330414c
authored
1月 14, 2020
作者:
chengye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test
上级
57e70271
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
11 行增加
和
13 行删除
+11
-13
workspace.xml
.idea/workspace.xml
+7
-9
EmInvoice.php
application/em/model/EmInvoice.php
+4
-4
没有找到文件。
.idea/workspace.xml
浏览文件 @
b330414c
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"f51c1393-9404-4c81-be85-d91ed40531b3"
name=
"默认更改列表"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/application/em/model/EmInvoice.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/em/model/EmInvoice.php"
afterDir=
"false"
/>
</list>
<list
default=
"true"
id=
"f51c1393-9404-4c81-be85-d91ed40531b3"
name=
"默认更改列表"
comment=
""
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -27,8 +25,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=
"
368
"
>
<caret
line=
"3
9"
column=
"37"
lean-forward=
"true"
selection-start-line=
"39"
selection-start-column=
"37"
selection-end-line=
"39"
selection-end-column=
"37
"
/>
<state
relative-caret-position=
"
213
"
>
<caret
line=
"3
4"
selection-start-line=
"34"
selection-start-column=
"2"
selection-end-line=
"37"
selection-end-column=
"88
"
/>
</state>
</provider>
</entry>
...
...
@@ -219,12 +217,12 @@
<workItem
from=
"1578817951649"
duration=
"618000"
/>
<workItem
from=
"1578900535997"
duration=
"5097000"
/>
<workItem
from=
"1578907167448"
duration=
"144000"
/>
<workItem
from=
"1578972376079"
duration=
"36
19
000"
/>
<workItem
from=
"1578972376079"
duration=
"36
73
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"9
566
000"
/>
<option
name=
"totallyTimeSpent"
value=
"9
620
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"1358"
y=
"-125"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
...
...
@@ -497,8 +495,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/em/model/EmInvoice.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
368
"
>
<caret
line=
"3
9"
column=
"37"
lean-forward=
"true"
selection-start-line=
"39"
selection-start-column=
"37"
selection-end-line=
"39"
selection-end-column=
"37
"
/>
<state
relative-caret-position=
"
213
"
>
<caret
line=
"3
4"
selection-start-line=
"34"
selection-start-column=
"2"
selection-end-line=
"37"
selection-end-column=
"88
"
/>
</state>
</provider>
</entry>
...
...
application/em/model/EmInvoice.php
浏览文件 @
b330414c
...
...
@@ -32,10 +32,10 @@ class EmInvoice extends Base
public
function
getInvoiceList
(
$map
,
$Nowpage
,
$limits
){
$data
=
self
::
alias
(
'inv'
)
->
field
(
'inv.*'
)
->
field
(
'station.station_name'
)
->
field
(
'em.em_numb'
)
->
leftJoin
([
'em'
],
'em.id=eu.em_id'
)
->
leftJoin
([
'station_info'
=>
'station'
],
'station.station_id=em.station_id'
)
//
->field('station.station_name')
//
->field('em.em_numb')
//
->leftJoin(['em'],'em.id=eu.em_id')
//
->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->
where
(
$map
)
->
page
(
$Nowpage
,
$limits
)
->
select
()
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论