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
f42afe00
Commit
f42afe00
authored
Dec 08, 2025
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):超设计使用年限bug修改
parent
0032511b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
JgOverDesignServiceLifeServiceImpl.java
.../biz/service/impl/JgOverDesignServiceLifeServiceImpl.java
+8
-8
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgOverDesignServiceLifeServiceImpl.java
View file @
f42afe00
...
@@ -158,18 +158,18 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
...
@@ -158,18 +158,18 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
this
.
repeatUsedEquipCheck
(
equipmentLists
,
this
.
repeatUsedEquipCheck
(
equipmentLists
,
CompanyTypeEnum
.
INDIVIDUAL
.
getName
().
equals
(
company
.
getCompanyType
())
?
company
.
getCompanyCode
().
split
(
"_"
)[
1
]
:
company
.
getCompanyCode
());
CompanyTypeEnum
.
INDIVIDUAL
.
getName
().
equals
(
company
.
getCompanyType
())
?
company
.
getCompanyCode
().
split
(
"_"
)[
1
]
:
company
.
getCompanyCode
());
}
}
List
<
IdxBizJgInspectionDetectionInfo
>
inspectionDetectionInfoList
=
idxBizJgInspectionDetectionInfoService
.
checkInspectionInfo
(
//
List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
equipmentLists
.
stream
()
//
equipmentLists.stream()
.
map
(
v
->
(
String
)
v
.
get
(
"record"
))
//
.map(v -> (String) v.get("record"))
.
collect
(
Collectors
.
toList
())
//
.collect(Collectors.toList())
);
//
);
if
(
equipmentLists
.
stream
().
anyMatch
(
info
->
info
.
get
(
"safetyAssessmentReport"
)
==
null
||
""
.
equals
(
info
.
get
(
"safetyAssessmentReport"
))))
{
if
(
equipmentLists
.
stream
().
anyMatch
(
info
->
info
.
get
(
"safetyAssessmentReport"
)
==
null
||
""
.
equals
(
info
.
get
(
"safetyAssessmentReport"
))))
{
throw
new
BadRequest
(
"请补充设备安全评估报告信息后提交!"
);
throw
new
BadRequest
(
"请补充设备安全评估报告信息后提交!"
);
}
}
if
(
inspectionDetectionInfoList
.
stream
().
anyMatch
(
info
->
if
(
equipmentLists
.
stream
().
anyMatch
(
info
->
ObjectUtils
.
isEmpty
(
info
)
||
ObjectUtils
.
isEmpty
(
info
.
get
InspectType
(
))
||
ObjectUtils
.
isEmpty
(
info
)
||
ObjectUtils
.
isEmpty
(
info
.
get
(
"inspectType"
))
||
ObjectUtils
.
isEmpty
(
info
.
get
InspectConclusion
())
||
ObjectUtils
.
isEmpty
(
info
.
getInspectOrgCode
(
))))
{
ObjectUtils
.
isEmpty
(
info
.
get
(
"inspectConclusion"
))
||
ObjectUtils
.
isEmpty
(
info
.
get
(
"inspectOrgCode"
))))
{
throw
new
BadRequest
(
"请补充设备检验检测信息后提交!"
);
throw
new
BadRequest
(
"请补充设备检验检测信息后提交!"
);
}
}
if
(
"2000"
.
equals
(
Objects
.
toString
(
map
.
get
(
"equListCode"
)))
&&
equipmentLists
.
stream
().
anyMatch
(
info
->
!
"WTJY"
.
equals
(
info
.
get
(
"inspectType"
))))
{
if
(
"2000"
.
equals
(
Objects
.
toString
(
map
.
get
(
"equListCode"
)))
&&
equipmentLists
.
stream
().
anyMatch
(
info
->
!
"WTJY"
.
equals
(
info
.
get
(
"inspectType"
))))
{
...
...
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