切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
6aae0020fee79a289b128ce7c85b8a179e7e80ee
1 个父辈
4a089140
1 个管道 的构建
通过
耗费 4 秒
消息通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
37 行增加
和
65 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
6aae002
...
...
@@ -16,8 +16,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=
"273"
>
<caret
line=
"350"
column=
"71"
lean-forward=
"true"
selection-start-line=
"350"
selection-start-column=
"71"
selection-end-line=
"350"
selection-end-column=
"71"
/>
<state
relative-caret-position=
"205"
>
<caret
line=
"362"
column=
"18"
lean-forward=
"true"
selection-start-line=
"362"
selection-start-column=
"18"
selection-end-line=
"362"
selection-end-column=
"18"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -33,52 +33,14 @@
<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#14952#15216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15221#17583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16428#16834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16848#17241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17251#17577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17590#18034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18039#18473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18478#18738#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"92"
>
<caret
line=
"722"
column=
"29"
lean-forward=
"true"
selection-start-line=
"722"
selection-start-column=
"29"
selection-end-line=
"722"
selection-end-column=
"29"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1226#2883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2889#3141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3146#3601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3607#4162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4169#5444#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5450#6170#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6175#7593#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7599#8271#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9868#10726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10731#12492#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15454#16101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16106#17544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17550#17966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17971#18790#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18795#19473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19479#19933#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19938#20712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20718#21224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21229#22660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22666#22945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23398#23632#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23637#24030#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24036#24267#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24272#24630#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15408#15672#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15677#18039#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16884#17290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17304#17697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17707#18033#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18046#18490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18495#18929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18934#19194#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -153,10 +115,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"311"
/>
<option
name=
"y"
value=
"59"
/>
<option
name=
"x"
value=
"354"
/>
<option
name=
"y"
value=
"48"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"9
04
"
/>
<option
name=
"height"
value=
"9
40
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -277,15 +239,15 @@
<workItem
from=
"1568852246741"
duration=
"7527000"
/>
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"
7918
000"
/>
<workItem
from=
"1568938332139"
duration=
"
11165
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"27
1121
000"
/>
<option
name=
"totallyTimeSpent"
value=
"27
4368
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"3
11"
y=
"59"
width=
"1717"
height=
"904
"
extended-state=
"0"
/>
<frame
x=
"3
54"
y=
"48"
width=
"1717"
height=
"940
"
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.15932408"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -702,8 +664,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"273"
>
<caret
line=
"350"
column=
"71"
lean-forward=
"true"
selection-start-line=
"350"
selection-start-column=
"71"
selection-end-line=
"350"
selection-end-column=
"71"
/>
<state
relative-caret-position=
"205"
>
<caret
line=
"362"
column=
"18"
lean-forward=
"true"
selection-start-line=
"362"
selection-start-column=
"18"
selection-end-line=
"362"
selection-end-column=
"18"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -719,14 +681,14 @@
<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#14952#15216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15221#17583#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16428#16834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16848#17241#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17251#17577#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17590#18034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18039#18473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18478#18738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15408#15672#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15677#18039#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16884#17290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17304#17697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17707#18033#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18046#18490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18495#18929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18934#19194#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
6aae002
...
...
@@ -341,9 +341,10 @@ class ActiveController extends RestBaseController
$city
=
explode
(
','
,
trim
(
$job
[
'city'
],
','
));
if
(
in_array
(
$arr
[
'city'
],
$city
)){
//用户所选的通知城市在活动发布城市中
$send
=
Db
::
name
(
'send'
)
->
where
([
'job_id'
=>
$info
[
'job_id'
],
'user_id'
=>
$info
[
'user_id'
]])
->
find
();
if
(
empty
(
$send
)){
$form
=
Db
::
name
(
'form'
)
->
where
([
'user_id'
=>
$
info
[
'user_id'
],
'past_time'
=>
[
'gt'
,
time
()]])
->
order
(
'past_time desc'
)
->
find
();
$form
=
Db
::
name
(
'form'
)
->
where
([
'user_id'
=>
$
job
[
'user_id'
],
'past_time'
=>
[
'gt'
,
time
()]])
->
order
(
'past_time desc'
)
->
find
();
if
(
empty
(
$form
)){
$param
[
'status'
]
=
2
;
$data
=
Db
::
name
(
'apply'
)
...
...
@@ -384,6 +385,15 @@ class ActiveController extends RestBaseController
if
(
empty
(
$result2
)){
$this
->
error
(
'sql2执行失败'
);
}
$param
[
'status'
]
=
2
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
if
(
$data
){
$this
->
success
(
'SUCCESS'
);
}
else
{
$this
->
error
(
'sql执行失败2'
);
}
}
}
else
{
//发送了服务通知同时将报名审核状态变为通过
...
...
请
注册
或
登录
后发表评论