切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
27fc9cda6e1b39b3112fa1d38297c6f9d9db1f6a
1 个父辈
0dadf11d
1 个管道 的构建
失败
耗费 1 秒
修改活动详情
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
67 行增加
和
30 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
app/admin/controller/StatisticController.php
.idea/workspace.xml
查看文件 @
27fc9cd
...
...
@@ -5,7 +5,6 @@
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
afterPath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -16,26 +15,31 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"StatisticController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"StatisticController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"448"
>
<caret
line=
"73"
column=
"9"
lean-forward=
"true"
selection-start-line=
"73"
selection-start-column=
"9"
selection-end-line=
"73"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"300"
>
<caret
line=
"51"
column=
"57"
lean-forward=
"true"
selection-start-line=
"51"
selection-start-column=
"57"
selection-end-line=
"51"
selection-end-column=
"57"
/>
<folding>
<marker
date=
"156816
3294161"
expanded=
"true"
signature=
"4348:438
4"
ph=
"select COUNT... cmf_job"
/>
<marker
date=
"156816
6645730"
expanded=
"true"
signature=
"4358:439
4"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"273"
column=
"34"
lean-forward=
"true"
selection-start-line=
"273"
selection-start-column=
"34"
selection-end-line=
"273"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"482"
>
<caret
line=
"342"
column=
"34"
lean-forward=
"true"
selection-start-line=
"342"
selection-start-column=
"34"
selection-end-line=
"342"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#9338#10067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#12146#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3612#4265#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4270#5416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5422#6032#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6037#7195#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7201#7997#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8002#9332#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11590#12175#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -77,9 +81,9 @@
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html"
/>
<option
value=
"$PROJECT_DIR$/app/user/controller/AdminIndexController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
</list>
</option>
</component>
...
...
@@ -90,9 +94,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"380"
/>
<option
name=
"y"
value=
"63"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"210"
/>
<option
name=
"y"
value=
"45"
/>
<option
name=
"width"
value=
"1410"
/>
<option
name=
"height"
value=
"1012"
/>
</component>
...
...
@@ -220,15 +224,15 @@
<workItem
from=
"1568027661451"
duration=
"746000"
/>
<workItem
from=
"1568077893489"
duration=
"8055000"
/>
<workItem
from=
"1568087646832"
duration=
"20777000"
/>
<workItem
from=
"1568160847626"
duration=
"
2589
000"
/>
<workItem
from=
"1568160847626"
duration=
"
5532
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
2264
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
5207
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
380"
y=
"63"
width=
"1410"
height=
"1012"
extended-state=
"0
"
/>
<frame
x=
"
210"
y=
"45"
width=
"1410"
height=
"1012"
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.19081779"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -257,7 +261,9 @@
<option
name=
"myLimit"
value=
"2678400000"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager
/>
<breakpoint-manager>
<option
name=
"time"
value=
"1"
/>
</breakpoint-manager>
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
...
...
@@ -266,7 +272,7 @@
<state
relative-caret-position=
"2875"
>
<caret
line=
"121"
column=
"41"
lean-forward=
"false"
selection-start-line=
"121"
selection-start-column=
"30"
selection-end-line=
"121"
selection-end-column=
"41"
/>
<folding>
<marker
date=
"156816
3294161"
expanded=
"true"
signature=
"4348:438
4"
ph=
"select COUNT... cmf_job"
/>
<marker
date=
"156816
6645730"
expanded=
"true"
signature=
"4358:439
4"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
...
...
@@ -284,7 +290,7 @@
<state
relative-caret-position=
"850"
>
<caret
line=
"40"
column=
"46"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"46"
selection-end-line=
"40"
selection-end-column=
"46"
/>
<folding>
<marker
date=
"156816
3294161"
expanded=
"true"
signature=
"4348:438
4"
ph=
"select COUNT... cmf_job"
/>
<marker
date=
"156816
6645730"
expanded=
"true"
signature=
"4358:439
4"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
...
...
@@ -451,23 +457,52 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/StatisticController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-2652"
>
<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
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-902"
>
<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
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-450"
>
<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
/>
</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=
"448"
>
<caret
line=
"73"
column=
"9"
lean-forward=
"true"
selection-start-line=
"73"
selection-start-column=
"9"
selection-end-line=
"73"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"482"
>
<caret
line=
"342"
column=
"34"
lean-forward=
"true"
selection-start-line=
"342"
selection-start-column=
"34"
selection-end-line=
"342"
selection-end-column=
"34"
/>
<folding>
<marker
date=
"1568163294161"
expanded=
"true"
signature=
"4348:4384"
ph=
"select COUNT... cmf_job"
/>
<element
signature=
"e#3612#4265#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4270#5416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5422#6032#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6037#7195#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7201#7997#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8002#9332#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11590#12175#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/ap
i/index/controller/Resource
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/ap
p/admin/controller/Statistic
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"273"
column=
"34"
lean-forward=
"true"
selection-start-line=
"273"
selection-start-column=
"34"
selection-end-line=
"273"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"300"
>
<caret
line=
"51"
column=
"57"
lean-forward=
"true"
selection-start-line=
"51"
selection-start-column=
"57"
selection-end-line=
"51"
selection-end-column=
"57"
/>
<folding>
<element
signature=
"e#9338#10067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11561#12146#0#PHP"
expanded=
"false"
/>
<marker
date=
"1568166645730"
expanded=
"true"
signature=
"4358:4394"
ph=
"select COUNT... cmf_job"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ResourceController.php
查看文件 @
27fc9cd
...
...
@@ -339,6 +339,7 @@ class ResourceController extends RestBaseController
$where['id']
= ['eq',
$id
];
$jobModel
= new JobModel();
$info
=
$jobModel->getOne
(
$where
);
$data['status']
= 0;
$data['id']
=
$info['id']
;
$data['job_title']
=
$info['job_title']
;
$data['create_time']
= date('Y-m-d H:i:s',
$info['create_time']
);
...
...
app/admin/controller/StatisticController.php
查看文件 @
27fc9cd
...
...
@@ -45,6 +45,7 @@ class StatisticController extends AdminBaseController
->
whereTime
(
'create_time'
,
'today'
)
->
count
();
//发布总数量
$arr
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
])
...
...
@@ -57,7 +58,7 @@ class StatisticController extends AdminBaseController
//供给发布
$arr1
=
Db
::
name
(
'job'
)
->
where
([
'delete_time'
=>
0
,
'status'
=>
1
,
'job_type'
=>
1
])
->
field
(
'count(id) as provide_num,create_time'
)
->
field
(
'count(id) as provide_num,create_time
,end_time
'
)
->
group
(
"FROM_UNIXTIME(create_time,'%Y-%m-%d')"
)
->
order
(
'create_time desc'
)
->
select
()
...
...
请
注册
或
登录
后发表评论