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
01821f11
Commit
01821f11
authored
Oct 15, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jyjc):检验检测--首检应该是在设备未走使用登记之前的检验
parent
8aa9fd23
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
JyjcInspectionApplicationServiceImpl.java
...iz/service/impl/JyjcInspectionApplicationServiceImpl.java
+8
-3
No files found.
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @
01821f11
...
@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
...
@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import
com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory
;
import
com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory
;
import
com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.*
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.*
;
import
com.yeejoin.amos.boot.module.jyjc.api.enums.*
;
import
com.yeejoin.amos.boot.module.jyjc.api.enums.*
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper
;
...
@@ -1242,7 +1243,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
...
@@ -1242,7 +1243,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"USE_INNER_CODE"
));
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"USE_INNER_CODE"
));
boolMust
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"USE_INNER_CODE"
,
test
));
boolMust
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"USE_INNER_CODE"
,
test
));
}
}
this
.
setFilterOfInFlowing
(
boolMust
);
this
.
setFilterOfInFlowing
(
boolMust
,
map
.
getString
(
"EQU_LIST_CODE"
),
map
.
getString
(
"inspectionType"
)
);
builder
.
query
(
boolMust
);
builder
.
query
(
boolMust
);
builder
.
sort
(
"REC_DATE"
,
SortOrder
.
DESC
);
builder
.
sort
(
"REC_DATE"
,
SortOrder
.
DESC
);
builder
.
from
((
pageNumber
-
1
)
*
size
);
builder
.
from
((
pageNumber
-
1
)
*
size
);
...
@@ -1282,12 +1283,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
...
@@ -1282,12 +1283,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
*
*
* @param boolMust 条件
* @param boolMust 条件
*/
*/
private
void
setFilterOfInFlowing
(
BoolQueryBuilder
boolMust
)
{
private
void
setFilterOfInFlowing
(
BoolQueryBuilder
boolMust
,
String
equListCode
,
String
inspectionType
)
{
Set
<
String
>
records
=
this
.
getEquipInFlowing
();
Set
<
String
>
records
=
this
.
getEquipInFlowing
();
if
(
records
!=
null
&&
!
records
.
isEmpty
())
{
if
(
records
!=
null
&&
!
records
.
isEmpty
())
{
boolMust
.
mustNot
(
QueryBuilders
.
termsQuery
(
"SEQUENCE_NBR.keyword"
,
records
));
boolMust
.
mustNot
(
QueryBuilders
.
termsQuery
(
"SEQUENCE_NBR.keyword"
,
records
));
}
}
// 只有纳管的设备才能做业务 TODO
if
(
"5000"
.
equals
(
equListCode
)
&&
JYJCBusinessTypeEnum
.
SCJY
.
getCode
().
equals
(
inspectionType
))
{
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"IS_INTO_MANAGEMENT"
,
false
));
}
// 只有纳管的设备才能做业务
boolMust
.
must
(
QueryBuilders
.
existsQuery
(
"IS_INTO_MANAGEMENT"
));
boolMust
.
must
(
QueryBuilders
.
existsQuery
(
"IS_INTO_MANAGEMENT"
));
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"IS_INTO_MANAGEMENT"
,
true
));
boolMust
.
must
(
QueryBuilders
.
termQuery
(
"IS_INTO_MANAGEMENT"
,
true
));
}
}
...
...
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