Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
d479a7c7
Commit
d479a7c7
authored
Aug 15, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(统计-应急-事件统计):1,bug修改,2,和列表查询条件对其,时间格式统一为年月日时分秒
parent
fc63c15c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
AlertStatisticsMapper.xml
...s-api/src/main/resources/mapper/AlertStatisticsMapper.xml
+2
-1
YJDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java
+2
-2
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml
View file @
d479a7c7
...
...
@@ -158,7 +158,8 @@
FROM
tz_alert_called
WHERE
biz_org_code like concat(#{orgCode}, '%')
is_delete = 0
and biz_org_code like concat(#{orgCode}, '%')
and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
<if
test=
"dto.beginDate !=null and dto.beginDate !=''"
>
and date_ge(CAST(call_time as date),#{dto.beginDate})
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java
View file @
d479a7c7
...
...
@@ -403,10 +403,10 @@ public class YJDPStatisticsServiceImpl {
private
void
setDefaultFilter
(
DPFilterParamDto
dpFilterParamDto
)
{
if
(
StringUtils
.
isEmpty
(
dpFilterParamDto
.
getBeginDate
()))
{
dpFilterParamDto
.
setBeginDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
offsetDay
(
new
Date
(),
-
30
).
to
DateStr
(
));
dpFilterParamDto
.
setBeginDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
offsetDay
(
new
Date
(),
-
30
).
to
String
(
"yyyy-MM-dd HH:mm:ss"
));
}
if
(
StringUtils
.
isEmpty
(
dpFilterParamDto
.
getEndDate
()))
{
dpFilterParamDto
.
setEndDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
today
());
dpFilterParamDto
.
setEndDate
(
cn
.
hutool
.
core
.
date
.
DateUtil
.
now
());
}
}
...
...
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