Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
ad65461b
Commit
ad65461b
authored
Jul 21, 2022
by
guojx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据统计调整:时间参数格式
parent
9437255c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
HmLinkController.java
...gic/haoban/manage/web/controller/hm/HmLinkController.java
+12
-9
HmLinkChartQO.java
...a/com/gic/haoban/manage/web/qo/hm/data/HmLinkChartQO.java
+6
-6
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
View file @
ad65461b
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
.
hm
;
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
.
hm
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
...
@@ -648,14 +649,22 @@ public class HmLinkController {
...
@@ -648,14 +649,22 @@ public class HmLinkController {
// 统计图表
// 统计图表
@RequestMapping
(
"statistics/chart"
)
@RequestMapping
(
"statistics/chart"
)
public
RestResponse
<
Object
>
statisticsChart
(
@RequestBody
HmLinkChartQO
qo
)
{
public
RestResponse
<
Object
>
statisticsChart
(
@RequestBody
HmLinkChartQO
qo
)
throws
ParseException
{
WebLoginDTO
loginUser
=
AuthWebRequestUtil
.
getLoginUser
();
WebLoginDTO
loginUser
=
AuthWebRequestUtil
.
getLoginUser
();
Long
linkId
=
qo
.
getLinkId
();
Long
linkId
=
qo
.
getLinkId
();
Date
startTime
=
qo
.
getStartTime
();
String
startTimeStr
=
qo
.
getStartTime
();
Date
endTime
=
qo
.
getEndTime
();
String
endTimeStr
=
qo
.
getEndTime
();
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
Date
startTime
=
null
;
Date
endTime
=
null
;
if
(
StringUtils
.
isNotBlank
(
startTimeStr
))
{
startTime
=
df
.
parse
(
startTimeStr
);
}
if
(
StringUtils
.
isNotBlank
(
endTimeStr
))
{
endTime
=
df
.
parse
(
endTimeStr
);
}
jsonObject
.
put
(
"enterpriseId"
,
loginUser
.
getEnterpriseId
());
jsonObject
.
put
(
"enterpriseId"
,
loginUser
.
getEnterpriseId
());
jsonObject
.
put
(
"linkId"
,
linkId
);
jsonObject
.
put
(
"linkId"
,
linkId
);
if
(
startTime
==
null
)
{
if
(
startTime
==
null
)
{
...
@@ -719,12 +728,6 @@ public class HmLinkController {
...
@@ -719,12 +728,6 @@ public class HmLinkController {
public
RestResponse
<
Object
>
statisticsClerk
(
@RequestBody
HmLinkClerkListQO
qo
)
{
public
RestResponse
<
Object
>
statisticsClerk
(
@RequestBody
HmLinkClerkListQO
qo
)
{
WebLoginDTO
loginUser
=
AuthWebRequestUtil
.
getLoginUser
();
WebLoginDTO
loginUser
=
AuthWebRequestUtil
.
getLoginUser
();
qo
.
getInFields
().
setEnterpriseId
(
loginUser
.
getEnterpriseId
());
qo
.
getInFields
().
setEnterpriseId
(
loginUser
.
getEnterpriseId
());
if
(
qo
.
getInFields
().
getStartTime
()
!=
null
)
{
qo
.
getInFields
().
setStartTime
(
qo
.
getInFields
().
getStartTime
()
+
" 00:00:00"
);
}
if
(
qo
.
getInFields
().
getEndTime
()
!=
null
)
{
qo
.
getInFields
().
setEndTime
(
qo
.
getInFields
().
getEndTime
()
+
" 23:59:59"
);
}
return
DataStatisticsParamUtils
return
DataStatisticsParamUtils
.
responsePage
(
DataHttpUtil
.
post
(
StatisticsApolloKeyConstant
.
data_haoban_link_detail
,
qo
));
.
responsePage
(
DataHttpUtil
.
post
(
StatisticsApolloKeyConstant
.
data_haoban_link_detail
,
qo
));
}
}
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmLinkChartQO.java
View file @
ad65461b
...
@@ -10,8 +10,8 @@ import java.util.Date;
...
@@ -10,8 +10,8 @@ import java.util.Date;
public
class
HmLinkChartQO
implements
Serializable
{
public
class
HmLinkChartQO
implements
Serializable
{
private
Long
linkId
;
private
Long
linkId
;
private
Date
startTime
;
private
String
startTime
;
private
Date
endTime
;
private
String
endTime
;
public
Long
getLinkId
()
{
public
Long
getLinkId
()
{
return
linkId
;
return
linkId
;
...
@@ -22,20 +22,20 @@ public class HmLinkChartQO implements Serializable {
...
@@ -22,20 +22,20 @@ public class HmLinkChartQO implements Serializable {
return
this
;
return
this
;
}
}
public
Date
getStartTime
()
{
public
String
getStartTime
()
{
return
startTime
;
return
startTime
;
}
}
public
HmLinkChartQO
setStartTime
(
Date
startTime
)
{
public
HmLinkChartQO
setStartTime
(
String
startTime
)
{
this
.
startTime
=
startTime
;
this
.
startTime
=
startTime
;
return
this
;
return
this
;
}
}
public
Date
getEndTime
()
{
public
String
getEndTime
()
{
return
endTime
;
return
endTime
;
}
}
public
HmLinkChartQO
setEndTime
(
Date
endTime
)
{
public
HmLinkChartQO
setEndTime
(
String
endTime
)
{
this
.
endTime
=
endTime
;
this
.
endTime
=
endTime
;
return
this
;
return
this
;
}
}
...
...
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