切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
a92db2892a967190fc0692c0a59909a56c955064
1 个父辈
76ae591f
1 个管道 的构建
通过
耗费 0 秒
我的供给里加需求人数
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
80 行增加
和
45 行删除
.idea/workspace.xml
api/index/controller/ReleaseController.php
api/index/controller/ResourceController.php
.idea/workspace.xml
查看文件 @
a92db28
...
...
@@ -3,7 +3,8 @@
<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/SendController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,18 +14,16 @@
<option
name=
"LAST_RESOLUTION"
value=
"IGNORE"
/>
</component>
<component
name=
"FileEditorManager"
>
<leaf>
<file
leaf-file-name=
"SendController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"ReleaseController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"215"
>
<caret
line=
"201"
column=
"31"
lean-forward=
"true"
selection-start-line=
"201"
selection-start-column=
"31"
selection-end-line=
"201"
selection-end-column=
"31"
/>
<state
relative-caret-position=
"-263"
>
<caret
line=
"237"
column=
"36"
lean-forward=
"false"
selection-start-line=
"237"
selection-start-column=
"36"
selection-end-line=
"237"
selection-end-column=
"36"
/>
<folding>
<element
signature=
"e#296#1102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1108#2382#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2388#2572#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2577#2771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3956#5516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4202#4830#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4835#5942#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5948#6775#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -77,7 +76,6 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/FinanceController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html"
/>
...
...
@@ -87,11 +85,12 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/ProvideController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
</list>
</option>
</component>
...
...
@@ -110,8 +109,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"660"
/>
<option
name=
"y"
value=
"61"
/>
<option
name=
"x"
value=
"75"
/>
<option
name=
"y"
value=
"41"
/>
<option
name=
"width"
value=
"1935"
/>
<option
name=
"height"
value=
"952"
/>
</component>
...
...
@@ -131,7 +130,6 @@
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -161,6 +159,7 @@
<select
/>
</subPane>
</pane>
<pane
id=
"Scope"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -224,27 +223,28 @@
<workItem
from=
"1569230064367"
duration=
"9043000"
/>
<workItem
from=
"1569284113019"
duration=
"15405000"
/>
<workItem
from=
"1569315557660"
duration=
"58000"
/>
<workItem
from=
"1569389764200"
duration=
"1116000"
/>
<workItem
from=
"1569389764200"
duration=
"1390000"
/>
<workItem
from=
"1569391173899"
duration=
"477000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"35
8600
000"
/>
<option
name=
"totallyTimeSpent"
value=
"35
9351
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
660"
y=
"6
1"
width=
"1935"
height=
"952"
extended-state=
"0"
/>
<frame
x=
"
75"
y=
"4
1"
width=
"1935"
height=
"952"
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.16
32
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.16
48
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.34076828"
sideWeight=
"0.50296295"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.2992383"
sideWeight=
"0.49703702"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -515,13 +515,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"22"
column=
"7"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"7"
selection-end-line=
"22"
selection-end-column=
"7"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/DemandController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
...
...
@@ -550,20 +543,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"265"
>
<caret
line=
"631"
column=
"40"
lean-forward=
"true"
selection-start-line=
"631"
selection-start-column=
"40"
selection-end-line=
"631"
selection-end-column=
"40"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"889"
>
<caret
line=
"429"
column=
"7"
lean-forward=
"true"
selection-start-line=
"429"
selection-start-column=
"7"
selection-end-line=
"429"
selection-end-column=
"7"
/>
</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=
"421"
>
...
...
@@ -587,8 +566,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"215"
>
<caret
line=
"201"
column=
"31"
lean-forward=
"true"
selection-start-line=
"201"
selection-start-column=
"31"
selection-end-line=
"201"
selection-end-column=
"31"
/>
<state
relative-caret-position=
"25"
>
<caret
line=
"201"
column=
"31"
lean-forward=
"false"
selection-start-line=
"201"
selection-start-column=
"31"
selection-end-line=
"201"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#296#1102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1108#2382#0#PHP"
expanded=
"false"
/>
...
...
@@ -599,5 +578,55 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-10"
>
<caret
line=
"267"
column=
"7"
lean-forward=
"true"
selection-start-line=
"267"
selection-start-column=
"7"
selection-end-line=
"267"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#7631#8334#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8339#9976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9982#10840#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10845#12783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12789#13629#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13634#15739#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15745#16392#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16397#18012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18018#18434#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18439#19258#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19263#19941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19947#20401#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20406#21264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21270#21776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21781#23212#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23218#23497#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23502#23944#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23950#24184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24189#24582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24588#24819#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24824#25182#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-2335"
>
<caret
line=
"22"
column=
"7"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"7"
selection-end-line=
"22"
selection-end-column=
"7"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-263"
>
<caret
line=
"237"
column=
"36"
lean-forward=
"false"
selection-start-line=
"237"
selection-start-column=
"36"
selection-end-line=
"237"
selection-end-column=
"36"
/>
<folding>
<element
signature=
"e#4202#4830#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4835#5942#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5948#6775#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/ReleaseController.php
查看文件 @
a92db28
...
...
@@ -158,6 +158,7 @@ class ReleaseController extends RestBaseController
* @return job_title:信息标题
* @return end_time:有效日期
* @return linkman:联系人
* @return needpeople:需求人数
* @return linkman_tel:联系人电话
* @return city:城市
* @return city_id:城市ID
...
...
@@ -182,6 +183,7 @@ class ReleaseController extends RestBaseController
$data
[
'end_time'
]
=
date
(
'Y-m-d'
,
$info
[
'end_time'
]);
$data
[
'linkman'
]
=
$info
[
'linkman'
];
$data
[
'linkman_tel'
]
=
$info
[
'linkman_tel'
];
$data
[
'needpeople'
]
=
$info
[
'needpeople'
];
$data
[
'city_id'
]
=
$info
[
'city'
];
$city
=
explode
(
','
,
trim
(
$info
[
'city'
],
','
));
$data
[
'city'
]
=
Db
::
name
(
'area'
)
->
whereIn
(
'id'
,
$city
)
->
column
(
'name'
);
...
...
@@ -205,6 +207,7 @@ class ReleaseController extends RestBaseController
* @param name:job_title type:string require:1 desc:信息标题
* @param name:end_time type:string require:0 desc:有效日期
* @param name:linkman type:string require:1 desc:联系人
* @param name:needpeople type:int require:1 desc:需求人数
* @param name:linkman_tel type:string require:1 desc:手机号码
* @param name:city type:string require:1 desc: 城市(最多添加五个)
* @param name:company_name type:string require:1 desc:公司名称不能为空
...
...
@@ -232,6 +235,7 @@ class ReleaseController extends RestBaseController
'job_title'
=>
'require'
,
'linkman'
=>
'require'
,
'city'
=>
'require'
,
'needpeopel'
=>
'require'
,
'linkman_tel'
=>
'require|number|max:11'
,
'company_name'
=>
'require'
,
'content'
=>
'require'
,
...
...
api/index/controller/ResourceController.php
查看文件 @
a92db28
...
...
@@ -259,6 +259,7 @@ class ResourceController extends RestBaseController
* @return end_time:有效日期
* @return linkman:联系人
* @return linkman_tel:联系人电话
* @return needpeople:需求人数
* @return city:城市
* @return company_name:公司名称
* @return content:项目详情
...
...
@@ -298,6 +299,7 @@ class ResourceController extends RestBaseController
$data
[
'end_time'
]
=
date
(
'Y-m-d'
,
$info
[
'end_time'
]);
$data
[
'look_num'
]
=
$info
[
'look_num'
];
$data
[
'share_num'
]
=
$info
[
'share_num'
];
$data
[
'needpeople'
]
=
$info
[
'needpeople'
];
$data
[
'linkman'
]
=
$info
[
'linkman'
];
$data
[
'linkman_tel'
]
=
$info
[
'linkman_tel'
];
$city
=
explode
(
','
,
trim
(
$info
[
'city'
],
','
));
...
...
请
注册
或
登录
后发表评论