切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
ecedcf762ae41573beee79fd3499c17a28492d39
1 个父辈
3dff7635
1 个管道 的构建
通过
耗费 0 秒
测试消息通知
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
98 行增加
和
65 行删除
.idea/workspace.xml
api/index/controller/ActiveController.php
.idea/workspace.xml
查看文件 @
ecedcf7
...
...
@@ -2,6 +2,7 @@
<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"
/>
...
...
@@ -16,33 +17,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=
"450"
>
<caret
line=
"357"
column=
"34"
lean-forward=
"false"
selection-start-line=
"357"
selection-start-column=
"34"
selection-end-line=
"357"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"208"
>
<caret
line=
"509"
column=
"0"
lean-forward=
"true"
selection-start-line=
"509"
selection-start-column=
"0"
selection-end-line=
"509"
selection-end-column=
"0"
/>
<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#3566#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3572#4564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4569#5804#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5810#6419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6424#7610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7616#8139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8144#8677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8683#9203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9208#9741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9747#10014#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12837#13243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13257#13650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13660#13986#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13998#14262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14267#16629#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15474#15880#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15894#16287#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16297#16623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16636#17080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17085#17519#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17524#17784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#964#1855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1861#2461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2466#3609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3615#4607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4612#5847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5853#6462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6467#7653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7659#8182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8187#8720#0#PHP"
expanded=
"false"
/>
<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#12879#13285#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13299#13692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13702#14028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14040#14304#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14309#16671#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15516#15922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15936#16329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16339#16665#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -117,8 +116,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"53"
/>
<option
name=
"y"
value=
"152"
/>
<option
name=
"x"
value=
"-89"
/>
<option
name=
"y"
value=
"113"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"920"
/>
</component>
...
...
@@ -164,6 +163,24 @@
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"app"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -175,6 +192,11 @@
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../../project/competition"
/>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"D:\htdocs\project1\resource\api\index\controller"
/>
</key>
</component>
<component
name=
"RunDashboard"
>
<option
name=
"ruleStates"
>
<list>
...
...
@@ -218,15 +240,15 @@
<workItem
from=
"1568852246741"
duration=
"7527000"
/>
<workItem
from=
"1568861318343"
duration=
"14697000"
/>
<workItem
from=
"1568881010503"
duration=
"9880000"
/>
<workItem
from=
"1568938332139"
duration=
"6
407
000"
/>
<workItem
from=
"1568938332139"
duration=
"6
691
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"269
610
000"
/>
<option
name=
"totallyTimeSpent"
value=
"269
894
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
53"
y=
"152
"
width=
"1717"
height=
"920"
extended-state=
"1"
/>
<frame
x=
"
-89"
y=
"113
"
width=
"1717"
height=
"920"
extended-state=
"1"
/>
<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"
/>
...
...
@@ -261,13 +283,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"344"
>
<caret
line=
"224"
column=
"28"
lean-forward=
"false"
selection-start-line=
"224"
selection-start-column=
"28"
selection-end-line=
"224"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1361"
>
...
...
@@ -406,6 +421,13 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-71"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#264#1922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1937#4063#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4078#4931#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4946#5282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5297#5738#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -493,6 +515,10 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"350"
>
<caret
line=
"24"
column=
"23"
lean-forward=
"false"
selection-start-line=
"24"
selection-start-column=
"23"
selection-end-line=
"24"
selection-end-column=
"23"
/>
<folding>
<element
signature=
"e#616#1692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2440#3295#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -505,6 +531,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1225"
>
<caret
line=
"58"
column=
"39"
lean-forward=
"false"
selection-start-line=
"58"
selection-start-column=
"39"
selection-end-line=
"58"
selection-end-column=
"39"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -629,35 +656,41 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/CommonController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"8"
column=
"13"
lean-forward=
"true"
selection-start-line=
"8"
selection-start-column=
"13"
selection-end-line=
"8"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"450"
>
<caret
line=
"357"
column=
"34"
lean-forward=
"false"
selection-start-line=
"357"
selection-start-column=
"34"
selection-end-line=
"357"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"208"
>
<caret
line=
"509"
column=
"0"
lean-forward=
"true"
selection-start-line=
"509"
selection-start-column=
"0"
selection-end-line=
"509"
selection-end-column=
"0"
/>
<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#3566#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3572#4564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4569#5804#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5810#6419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6424#7610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7616#8139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8144#8677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8683#9203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9208#9741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9747#10014#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12837#13243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13257#13650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13660#13986#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13998#14262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14267#16629#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15474#15880#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15894#16287#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16297#16623#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16636#17080#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17085#17519#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17524#17784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#129#167#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#373#959#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#964#1855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1861#2461#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2466#3609#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3615#4607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4612#5847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5853#6462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6467#7653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7659#8182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8187#8720#0#PHP"
expanded=
"false"
/>
<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#12879#13285#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13299#13692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13702#14028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14040#14304#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14309#16671#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15516#15922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15936#16329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16339#16665#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ActiveController.php
查看文件 @
ecedcf7
...
...
@@ -13,6 +13,7 @@ use cmf\controller\RestBaseController;
use
think\Db
;
use
api\index\model\JobModel
;
use
think\Validate
;
use
app\admin\controller\CommonController
;
/**
...
...
@@ -340,7 +341,6 @@ 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
();
$form
=
Db
::
name
(
'form'
)
->
where
([
'user_id'
=>
$info
[
'user_id'
],
'past_time'
=>
[
'gt'
,
time
()]])
->
order
(
'past_time desc'
)
->
find
();
...
...
请
注册
或
登录
后发表评论