Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
8e6f015e
Commit
8e6f015e
authored
Dec 14, 2019
by
赵庆
Browse files
Options
Browse Files
Download
Plain Diff
gsb
parents
9cc8437c
442293f9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
bpo-stat/app/base/service/impl/all/merchantSve.js
+6
-6
No files found.
bpo-stat/app/base/service/impl/all/merchantSve.js
View file @
8e6f015e
...
@@ -137,12 +137,12 @@ class MerchantService extends ServiceBase {
...
@@ -137,12 +137,12 @@ class MerchantService extends ServiceBase {
var
sql
=
"SELECT DATE_FORMAT(invalid_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM merchant_info WHERE 1=1"
;
var
sql
=
"SELECT DATE_FORMAT(invalid_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM merchant_info WHERE 1=1"
;
var
sqls
=
"SELECT DATE_FORMAT(transaction_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM transaction_info WHERE 1=1"
;
var
sqls
=
"SELECT DATE_FORMAT(transaction_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM transaction_info WHERE 1=1"
;
if
(
params
.
company_name
)
{
if
(
params
.
company_name
)
{
sql
=
sql
+
" AN
N company_name = "
+
params
.
company_name
;
sql
=
sql
+
" AN
D company_name = '"
+
params
.
company_name
+
"'"
;
sqls
=
sqls
+
" AN
N company_name = "
+
params
.
company_name
;
sqls
=
sqls
+
" AN
D company_name = '"
+
params
.
company_name
+
"'"
;
}
}
if
(
params
.
sign_body
)
{
if
(
params
.
sign_body
)
{
sql
=
sql
+
" AND sign_body =
"
+
params
.
sign_body
;
sql
=
sql
+
" AND sign_body =
'"
+
params
.
sign_body
+
"'"
;
sqls
=
sqls
+
" AND sign_body =
"
+
params
.
sign_body
;
sqls
=
sqls
+
" AND sign_body =
'"
+
params
.
sign_body
+
"'"
;
}
}
if
(
params
.
signBegin
||
params
.
signEnd
)
{
if
(
params
.
signBegin
||
params
.
signEnd
)
{
sql
=
sql
+
" AND invalid_time >= '"
+
params
.
signBegin
+
" 00:00:00' AND invalid_time <= '"
+
params
.
signEnd
+
" 23:59:59'"
;
sql
=
sql
+
" AND invalid_time >= '"
+
params
.
signBegin
+
" 00:00:00' AND invalid_time <= '"
+
params
.
signEnd
+
" 23:59:59'"
;
...
@@ -246,10 +246,10 @@ class MerchantService extends ServiceBase {
...
@@ -246,10 +246,10 @@ class MerchantService extends ServiceBase {
var
sql
=
"SELECT DATE_FORMAT("
+
firlt
+
",'%Y-%m-%d') days,COUNT(id) COUNT FROM "
+
db
+
" WHERE 1=1"
;
var
sql
=
"SELECT DATE_FORMAT("
+
firlt
+
",'%Y-%m-%d') days,COUNT(id) COUNT FROM "
+
db
+
" WHERE 1=1"
;
if
(
params
.
company_name
)
{
if
(
params
.
company_name
)
{
sql
=
sql
+
" AN
N company_name = "
+
params
.
company_name
;
sql
=
sql
+
" AN
D company_name = '"
+
params
.
company_name
+
"'"
;
}
}
if
(
params
.
sign_body
)
{
if
(
params
.
sign_body
)
{
sql
=
sql
+
" AND sign_body =
"
+
params
.
sign_body
;
sql
=
sql
+
" AND sign_body =
'"
+
params
.
sign_body
+
"'"
;
}
}
var
charts
=
[[],[]];
var
charts
=
[[],[]];
var
chart
=
await
this
.
customQuery
(
sql
);
var
chart
=
await
this
.
customQuery
(
sql
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment