切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
d6c636f1fcd702a23d832adc815a90677af29639
1 个父辈
7e2c31c8
1 个管道 的构建
通过
耗费 3 秒
测试服务通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
35 行增加
和
28 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
d6c636f
...
...
@@ -17,8 +17,8 @@
<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=
"378"
>
<caret
line=
"325"
column=
"47"
lean-forward=
"false"
selection-start-line=
"325"
selection-start-column=
"47"
selection-end-line=
"325"
selection-end-column=
"47"
/>
<state
relative-caret-position=
"185"
>
<caret
line=
"377"
column=
"19"
lean-forward=
"true"
selection-start-line=
"377"
selection-start-column=
"19"
selection-end-line=
"377"
selection-end-column=
"19"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,14 +34,18 @@
<element
signature=
"e#8726#9246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9251#9784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9790#10057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15455#15719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15724#18086#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16931#17337#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17351#17744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17754#18080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18093#18537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18542#18976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18981#19241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13753#14247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14265#14672#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14686#15080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15090#15417#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15429#15693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15698#18060#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16905#17311#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17325#17718#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17728#18054#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18067#18511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18516#18950#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18955#19215#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -116,10 +120,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"241"
/>
<option
name=
"y"
value=
"72"
/>
<option
name=
"x"
value=
"317"
/>
<option
name=
"y"
value=
"68"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"9
40
"
/>
<option
name=
"height"
value=
"9
35
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -223,15 +227,15 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"
1846
000"
/>
<workItem
from=
"1568958569115"
duration=
"
2507
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"27
7380
000"
/>
<option
name=
"totallyTimeSpent"
value=
"27
8041
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
241"
y=
"72"
width=
"1717"
height=
"940
"
extended-state=
"0"
/>
<frame
x=
"
317"
y=
"68"
width=
"1717"
height=
"935
"
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.16113459"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -628,8 +632,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"378"
>
<caret
line=
"325"
column=
"47"
lean-forward=
"false"
selection-start-line=
"325"
selection-start-column=
"47"
selection-end-line=
"325"
selection-end-column=
"47"
/>
<state
relative-caret-position=
"185"
>
<caret
line=
"377"
column=
"19"
lean-forward=
"true"
selection-start-line=
"377"
selection-start-column=
"19"
selection-end-line=
"377"
selection-end-column=
"19"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -645,14 +649,18 @@
<element
signature=
"e#8726#9246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9251#9784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9790#10057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15455#15719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15724#18086#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16931#17337#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17351#17744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17754#18080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18093#18537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18542#18976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18981#19241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13753#14247#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14265#14672#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14686#15080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15090#15417#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15429#15693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15698#18060#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16905#17311#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17325#17718#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17728#18054#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18067#18511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18516#18950#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18955#19215#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
d6c636f
...
...
@@ -323,12 +323,11 @@ class ActiveController extends RestBaseController
{
//报名信息ID
$param
[
'id'
]
=
$this
->
request
->
param
(
'id'
);
$this
->
success
(
'SUCCESS'
,
$param
[
'id'
]);
//报名信息
$info
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
find
();
//获取该报名用户的账户信息
//获取该报名用户的账户信息
找出报名人的id 以及报名的活动信息ID
$arr
=
Db
::
name
(
'account'
)
->
where
(
'user_id'
,
$info
[
'user_id'
])
->
find
();
...
...
请
注册
或
登录
后发表评论