切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
47e4965972772e46850dbbf66c62f4a5ac6e3b41
1 个父辈
c2b157e8
1 个管道 的构建
通过
耗费 1 秒
测试通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
25 行增加
和
19 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
47e4965
...
...
@@ -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=
"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"
/>
<state
relative-caret-position=
"310"
>
<caret
line=
"353"
column=
"58"
lean-forward=
"true"
selection-start-line=
"353"
selection-start-column=
"58"
selection-end-line=
"353"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -33,11 +33,13 @@
<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#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"
/>
<element
signature=
"e#13873#14368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14386#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15553#15817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15822#18184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17029#17435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17449#17842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17852#18178#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -112,8 +114,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"235"
/>
<option
name=
"y"
value=
"40"
/>
<option
name=
"x"
value=
"178"
/>
<option
name=
"y"
value=
"43"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"935"
/>
</component>
...
...
@@ -219,15 +221,15 @@
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"
2877
000"
/>
<workItem
from=
"1568958569115"
duration=
"
3279
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"278
411
000"
/>
<option
name=
"totallyTimeSpent"
value=
"278
813
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
235"
y=
"40
"
width=
"1717"
height=
"935"
extended-state=
"0"
/>
<frame
x=
"
178"
y=
"43
"
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"
/>
...
...
@@ -624,8 +626,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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"
/>
<state
relative-caret-position=
"310"
>
<caret
line=
"353"
column=
"58"
lean-forward=
"true"
selection-start-line=
"353"
selection-start-column=
"58"
selection-end-line=
"353"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
...
...
@@ -641,11 +643,13 @@
<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#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"
/>
<element
signature=
"e#13873#14368#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14386#14794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15553#15817#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15822#18184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17029#17435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17449#17842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17852#18178#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
47e4965
...
...
@@ -345,6 +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
)){
$this
->
success
(
'SUCCESS'
,
123
);
$param
[
'status'
]
=
99
;
$data
=
Db
::
name
(
'apply'
)
->
where
(
'id'
,
$param
[
'id'
])
...
...
@@ -355,6 +356,7 @@ class ActiveController extends RestBaseController
$this
->
error
(
'sql执行失败1'
);
}
}
else
{
$this
->
success
(
'SUCCESS'
,
234
);
$openid
=
$this
->
getOpenid
(
$info
[
'user_id'
]);
//发送模板消息
$post_data
=
array
(
...
...
请
注册
或
登录
后发表评论