切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
e018c6102395f85dce1c52b311449be0848452a2
1 个父辈
a9cde0fa
1 个管道 的构建
通过
耗费 0 秒
降序
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
54 行增加
和
48 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
e018c61
...
...
@@ -16,29 +16,31 @@
<file
leaf-file-name=
"ActiveController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"290"
>
<caret
line=
"468"
column=
"38"
lean-forward=
"true"
selection-start-line=
"468"
selection-start-column=
"38"
selection-end-line=
"468"
selection-end-column=
"38"
/>
<state
relative-caret-position=
"96"
>
<caret
line=
"45"
column=
"27"
lean-forward=
"false"
selection-start-line=
"45"
selection-start-column=
"27"
selection-end-line=
"45"
selection-end-column=
"27"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1818#2418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2423#4006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4012#5004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5009#6244#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6250#6859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6864#8050#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8056#8579#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8584#9117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9123#9643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9648#10181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10187#10454#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15078#15342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20148#20548#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20553#20987#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20992#21252#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21257#21418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21442#22015#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22039#22849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#2458#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2463#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4052#5044#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5049#6284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6290#6899#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6904#8090#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8096#8619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8624#9157#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9163#9683#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9688#10261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10267#10534#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10539#15152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15158#15422#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15427#20222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20228#20628#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20633#21067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21072#21332#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21337#21498#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21522#22095#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22119#22929#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -122,9 +124,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"-118"
/>
<option
name=
"y"
value=
"62"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"532"
/>
<option
name=
"y"
value=
"60"
/>
<option
name=
"width"
value=
"1935"
/>
<option
name=
"height"
value=
"952"
/>
</component>
...
...
@@ -270,15 +272,15 @@
<workItem
from=
"1569053326084"
duration=
"3343000"
/>
<workItem
from=
"1569197707712"
duration=
"23819000"
/>
<workItem
from=
"1569230064367"
duration=
"9043000"
/>
<workItem
from=
"1569284113019"
duration=
"13
027
000"
/>
<workItem
from=
"1569284113019"
duration=
"13
788
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"355
048
000"
/>
<option
name=
"totallyTimeSpent"
value=
"355
809
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
-118"
y=
"62"
width=
"1935"
height=
"952"
extended-state=
"1
"
/>
<frame
x=
"
532"
y=
"60"
width=
"1935"
height=
"952"
extended-state=
"0
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.16"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -802,29 +804,31 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"290"
>
<caret
line=
"468"
column=
"38"
lean-forward=
"true"
selection-start-line=
"468"
selection-start-column=
"38"
selection-end-line=
"468"
selection-end-column=
"38"
/>
<state
relative-caret-position=
"96"
>
<caret
line=
"45"
column=
"27"
lean-forward=
"false"
selection-start-line=
"45"
selection-start-column=
"27"
selection-end-line=
"45"
selection-end-column=
"27"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1818#2418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2423#4006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4012#5004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5009#6244#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6250#6859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6864#8050#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8056#8579#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8584#9117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9123#9643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9648#10181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10187#10454#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15078#15342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20148#20548#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20553#20987#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20992#21252#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21257#21418#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21442#22015#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22039#22849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#2458#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2463#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4052#5044#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5049#6284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6290#6899#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6904#8090#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8096#8619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8624#9157#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9163#9683#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9688#10261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10267#10534#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10539#15152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15158#15422#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15427#20222#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20228#20628#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20633#21067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21072#21332#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21337#21498#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21522#22095#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22119#22929#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
e018c61
...
...
@@ -51,6 +51,7 @@ class ActiveController extends RestBaseController
$apply_id
=
Db
::
name
(
'apply'
)
->
where
(
'user_id'
,
$user_id
)
->
where
(
'status'
,
2
)
->
order
(
'create_time desc'
)
->
column
(
'job_id'
);
$data
=
Db
::
name
(
'job'
)
->
whereIn
(
'id'
,
$apply_id
)
...
...
@@ -312,6 +313,7 @@ class ActiveController extends RestBaseController
$list
=
Db
::
name
(
'apply'
)
->
where
(
'status'
,
2
)
->
where
(
'job_id'
,
$id
)
->
order
(
'create_time desc'
)
->
page
(
$page
,
$pageNum
)
->
select
();
$this
->
success
(
'SUCCESS'
,
$list
);
...
...
请
注册
或
登录
后发表评论