切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
c2b157e8f7932003b2d084d62886d436dbe6acdd
1 个父辈
d6c636f1
1 个管道 的构建
通过
耗费 0 秒
测试服务通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
25 行增加
和
40 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
c2b157e
...
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -17,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=
"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"
/>
<state
relative-caret-position=
"2798"
>
<caret
line=
"432"
column=
"33"
lean-forward=
"false"
selection-start-line=
"432"
selection-start-column=
"33"
selection-end-line=
"432"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -34,18 +33,11 @@
<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#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"
/>
<element
signature=
"e#15435#15699#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15704#18066#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16911#17317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17331#17724#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17734#18060#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -120,8 +112,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"317"
/>
<option
name=
"y"
value=
"68"
/>
<option
name=
"x"
value=
"235"
/>
<option
name=
"y"
value=
"40"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"935"
/>
</component>
...
...
@@ -227,15 +219,15 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"2
50
7000"
/>
<workItem
from=
"1568958569115"
duration=
"2
87
7000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"278
04
1000"
/>
<option
name=
"totallyTimeSpent"
value=
"278
41
1000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
317"
y=
"68
"
width=
"1717"
height=
"935"
extended-state=
"0"
/>
<frame
x=
"
235"
y=
"40
"
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"
/>
...
...
@@ -632,8 +624,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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"
/>
<state
relative-caret-position=
"2798"
>
<caret
line=
"432"
column=
"33"
lean-forward=
"false"
selection-start-line=
"432"
selection-start-column=
"33"
selection-end-line=
"432"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -649,18 +641,11 @@
<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#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"
/>
<element
signature=
"e#15435#15699#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15704#18066#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16911#17317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17331#17724#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17734#18060#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
c2b157e
...
...
@@ -345,7 +345,7 @@ class ActiveController extends RestBaseController
if
(
empty
(
$send
)){
$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
;
$param
[
'status'
]
=
99
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
@@ -384,7 +384,7 @@ class ActiveController extends RestBaseController
if
(
empty
(
$result2
)){
$this
->
error
(
'sql2执行失败'
);
}
$param
[
'status'
]
=
2
;
$param
[
'status'
]
=
98
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
@@ -396,7 +396,7 @@ class ActiveController extends RestBaseController
}
}
else
{
//发送了服务通知同时将报名审核状态变为通过
$param
[
'status'
]
=
2
;
$param
[
'status'
]
=
97
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
@@ -407,7 +407,7 @@ class ActiveController extends RestBaseController
}
}
}
else
{
$param
[
'status'
]
=
2
;
$param
[
'status'
]
=
96
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
@@ -419,7 +419,7 @@ class ActiveController extends RestBaseController
}
}
else
{
//用户关闭服务通知
$param
[
'status'
]
=
2
;
$param
[
'status'
]
=
95
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
@@ -430,7 +430,7 @@ class ActiveController extends RestBaseController
}
}
}
else
{
$param
[
'status'
]
=
2
;
$param
[
'status'
]
=
94
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
->
update
([
'status'
=>
$param
[
'status'
]]);
...
...
请
注册
或
登录
后发表评论