Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ncov
/
back
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
lintry
2020-01-29 16:31:01 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a7ce330b4804921b74a798456f70d14e95211cf6
a7ce330b
1 parent
f70edb72
增加省的条件
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
server/routers/c/info_action.js
server/routers/c/info_action.js
View file @
a7ce330
...
...
@@ -26,9 +26,9 @@ module.exports = function (dbo) {
try
{
// 获取数据
let
params
=
req
.
query
;
let
{
province
_name
}
=
params
;
let
{
province
}
=
params
;
province
_name
=
province_nam
e
||
''
;
province
=
provinc
e
||
''
;
// 代码逻辑区域
let
result
=
await
dbo
.
query
(
`
...
...
@@ -40,7 +40,7 @@ module.exports = function (dbo) {
from days d
left join tb_mf_timeline_area ta on ta.update_time::date = d.today
where 1=1
and province_name ~ :province
_name
and province_name ~ :province
group by 1,2
order by 2, 1
)
...
...
@@ -58,7 +58,7 @@ module.exports = function (dbo) {
from dat
group by 1
order by 2 desc
`
,
{
replacements
:
{
province
_name
},
type
:
dbo
.
QueryTypes
.
SELECT
});
`
,
{
replacements
:
{
province
},
type
:
dbo
.
QueryTypes
.
SELECT
});
return
Result
.
Ok
(
'成功!'
,
result
);
}
catch
(
e
)
{
...
...
@@ -76,8 +76,9 @@ module.exports = function (dbo) {
try
{
// 获取数据
let
params
=
req
.
query
;
let
{
date
}
=
params
;
let
{
date
,
province
}
=
params
;
date
=
date
||
moment
().
format
(
'YYYY-MM-DD'
);
province
=
province
||
''
;
// 代码逻辑区域
let
result
=
await
dbo
.
query
(
`
...
...
@@ -85,12 +86,13 @@ module.exports = function (dbo) {
select update_time, province_short_name province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country, row_number() over(partition by province_short_name order by update_time desc) rn
from tb_mf_timeline_area
where update_time::date = :date
and province_name ~ :province
)
select update_time, province, confirmed_count, suspected_count, cured_count, dead_count, "comment", cities, country
from t
where rn = 1
order by confirmed_count desc
`
,
{
replacements
:
{
date
},
type
:
dbo
.
QueryTypes
.
SELECT
});
`
,
{
replacements
:
{
date
,
province
},
type
:
dbo
.
QueryTypes
.
SELECT
});
return
Result
.
Ok
(
'成功!'
,
result
);
}
catch
(
e
)
{
...
...
Please
register
or
login
to post a comment