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
0ddc9f1f
Commit
0ddc9f1f
authored
Aug 19, 2024
by
麻笑宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改检验检测大屏办理量下钻页面数据问题
parent
ccd27a04
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
JYJCDPStatisticsServiceImpl.java
...atistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java
+2
-2
No files found.
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/JYJCDPStatisticsServiceImpl.java
View file @
0ddc9f1f
...
@@ -623,7 +623,7 @@ public class JYJCDPStatisticsServiceImpl {
...
@@ -623,7 +623,7 @@ public class JYJCDPStatisticsServiceImpl {
long
currentDayAfter30DayTime
=
DateUtil
.
offsetDay
(
DateUtil
.
parse
(
DateUtil
.
today
(),
"yyy-MM-dd"
),
30
).
getTime
();
long
currentDayAfter30DayTime
=
DateUtil
.
offsetDay
(
DateUtil
.
parse
(
DateUtil
.
today
(),
"yyy-MM-dd"
),
30
).
getTime
();
boolMust
.
must
(
QueryBuilders
.
rangeQuery
(
"NEXT_INSPECT_DATE"
).
gte
(
currentDayTime
).
lte
(
currentDayAfter30DayTime
));
boolMust
.
must
(
QueryBuilders
.
rangeQuery
(
"NEXT_INSPECT_DATE"
).
gte
(
currentDayTime
).
lte
(
currentDayAfter30DayTime
));
if
(
StrUtil
.
isNotEmpty
(
dpFilterParamForDetailDto
.
getTreeValue
()))
{
if
(
StrUtil
.
isNotEmpty
(
dpFilterParamForDetailDto
.
getTreeValue
())
&&
!
"0"
.
equals
(
dpFilterParamForDetailDto
.
getTreeValue
())
)
{
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"EQU_LIST_CODE"
,
dpFilterParamForDetailDto
.
getTreeValue
()));
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"EQU_LIST_CODE"
,
dpFilterParamForDetailDto
.
getTreeValue
()));
}
else
{
}
else
{
// 且8大类,目的去掉脏数据
// 且8大类,目的去掉脏数据
...
@@ -661,7 +661,7 @@ public class JYJCDPStatisticsServiceImpl {
...
@@ -661,7 +661,7 @@ public class JYJCDPStatisticsServiceImpl {
long
currentDayTime
=
DateUtil
.
parse
(
DateUtil
.
now
(),
"yyy-MM-dd"
).
getTime
();
long
currentDayTime
=
DateUtil
.
parse
(
DateUtil
.
now
(),
"yyy-MM-dd"
).
getTime
();
boolMust
.
must
(
QueryBuilders
.
rangeQuery
(
"NEXT_INSPECT_DATE"
).
lt
(
currentDayTime
));
boolMust
.
must
(
QueryBuilders
.
rangeQuery
(
"NEXT_INSPECT_DATE"
).
lt
(
currentDayTime
));
if
(
StrUtil
.
isNotEmpty
(
dpFilterParamForDetailDto
.
getTreeValue
()))
{
if
(
StrUtil
.
isNotEmpty
(
dpFilterParamForDetailDto
.
getTreeValue
())
&&
!
"0"
.
equals
(
dpFilterParamForDetailDto
.
getTreeValue
())
)
{
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"EQU_LIST_CODE"
,
dpFilterParamForDetailDto
.
getTreeValue
()));
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"EQU_LIST_CODE"
,
dpFilterParamForDetailDto
.
getTreeValue
()));
}
else
{
}
else
{
// 且8大类,目的去掉脏数据
// 且8大类,目的去掉脏数据
...
...
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