Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
4694580c
Commit
4694580c
authored
Jun 15, 2021
by
季圣华
Browse files
解决日志时间段查询的bug
parent
79248345
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
View file @
4694580c
...
...
@@ -67,6 +67,8 @@ public class LogService {
String
content
,
int
offset
,
int
rows
)
throws
Exception
{
List
<
LogVo4List
>
list
=
null
;
try
{
beginTime
=
Tools
.
parseDayToTime
(
beginTime
,
BusinessConstants
.
DAY_FIRST_TIME
);
endTime
=
Tools
.
parseDayToTime
(
endTime
,
BusinessConstants
.
DAY_LAST_TIME
);
list
=
logMapperEx
.
selectByConditionLog
(
operation
,
userId
,
clientIp
,
status
,
beginTime
,
endTime
,
content
,
offset
,
rows
);
if
(
null
!=
list
)
{
...
...
@@ -84,6 +86,8 @@ public class LogService {
String
content
)
throws
Exception
{
Long
result
=
null
;
try
{
beginTime
=
Tools
.
parseDayToTime
(
beginTime
,
BusinessConstants
.
DAY_FIRST_TIME
);
endTime
=
Tools
.
parseDayToTime
(
endTime
,
BusinessConstants
.
DAY_LAST_TIME
);
result
=
logMapperEx
.
countsByLog
(
operation
,
userId
,
clientIp
,
status
,
beginTime
,
endTime
,
content
);
}
catch
(
Exception
e
){
JshException
.
readFail
(
logger
,
e
);
...
...
Write
Preview
Supports
Markdown
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