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
4cd028f5
Commit
4cd028f5
authored
Nov 24, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(jyjc):检验检测业务管理
1.详情
parent
f9722c0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
5 deletions
+36
-5
JyjcBizManageController.java
...t/module/jyjc/biz/controller/JyjcBizManageController.java
+0
-2
JyjcBizManageServiceImpl.java
...odule/jyjc/biz/service/impl/JyjcBizManageServiceImpl.java
+36
-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/controller/JyjcBizManageController.java
View file @
4cd028f5
...
...
@@ -103,6 +103,4 @@ public class JyjcBizManageController extends BaseController {
return
ResponseHelper
.
buildResponse
(
jyjcBizManageService
.
getOne
(
appSeq
));
}
}
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/JyjcBizManageServiceImpl.java
View file @
4cd028f5
...
...
@@ -235,9 +235,9 @@ public class JyjcBizManageServiceImpl {
public
Boolean
detectionRegionEdit
(
String
appSeq
,
String
newDetectionRegion
)
{
JyjcOpeningApplication
openingApplication
=
openingApplicationService
.
getById
(
appSeq
);
openingApplication
.
setDetectionRegion
(
Arrays
.
stream
(
newDetectionRegion
.
split
(
","
)).
collect
(
Collectors
.
toList
()));
if
(
openingApplication
.
getExclusionRegion
()
!=
null
)
{
if
(
openingApplication
.
getExclusionRegion
()
!=
null
)
{
// 如果省局维护后的区域,去掉了一部分,则把市局停用区域字段也去掉
openingApplication
.
setExclusionRegion
(
openingApplication
.
getExclusionRegion
().
stream
().
filter
(
e
->
openingApplication
.
getDetectionRegion
().
contains
(
e
)).
collect
(
Collectors
.
toList
()));
openingApplication
.
setExclusionRegion
(
openingApplication
.
getExclusionRegion
().
stream
().
filter
(
e
->
openingApplication
.
getDetectionRegion
().
contains
(
e
)).
collect
(
Collectors
.
toList
()));
}
openingApplicationService
.
saveOrUpdate
(
openingApplication
);
return
Boolean
.
TRUE
;
...
...
@@ -249,6 +249,39 @@ public class JyjcBizManageServiceImpl {
}
public
Map
<
String
,
Object
>
getOne
(
String
appSeq
)
{
return
null
;
Map
<
String
,
Object
>
res
=
new
HashMap
<>();
JyjcOpeningApplication
openingApplication
=
openingApplicationService
.
getById
(
appSeq
);
JyjcInspectionHistory
jyjcInspectionHistory
=
inspectionHistoryService
.
getBySSeq
(
openingApplication
.
getSequenceNbr
());
if
(
jyjcInspectionHistory
!=
null
)
{
JSONObject
hisData
=
jyjcInspectionHistory
.
getHistoryData
();
BeanUtil
.
copyProperties
(
hisData
,
res
);
res
.
remove
(
"baseUnitLicences"
);
res
.
put
(
"licences"
,
getLicenceInfo
(
hisData
,
openingApplication
));
}
res
.
put
(
"detectionRegion"
,
openingApplication
.
getDetectionRegion
());
res
.
put
(
"exclusionRegion"
,
openingApplication
.
getExclusionRegion
());
res
.
put
(
"status"
,
openingApplication
.
getStatus
());
res
.
put
(
"applicationSeq"
,
openingApplication
.
getApplicationSeq
());
return
res
;
}
private
List
<
Map
<
String
,
Object
>>
getLicenceInfo
(
JSONObject
hisData
,
JyjcOpeningApplication
openingApplication
)
{
List
<
BaseUnitLicence
>
baseUnitLicences
=
new
ArrayList
<>();
List
<
BaseEnterpriseCertDto
>
certDtos
=
hisData
.
getJSONArray
(
BizCommonConstant
.
UNIT_LICENCE_KEY
).
toJavaList
(
BaseEnterpriseCertDto
.
class
);
certDtos
.
forEach
(
certDto
->
{
List
<
Long
>
certSeqList
=
openingApplicationService
.
getCertFromHisData
(
openingApplication
,
certDto
);
if
(!
certSeqList
.
isEmpty
())
{
List
<
BaseUnitLicence
>
baseUnitLicenceOne
=
baseUnitLicenceMapper
.
selectList
(
new
LambdaQueryWrapper
<
BaseUnitLicence
>().
in
(
BaseUnitLicence:
:
getEnterpriseCertSeq
,
certSeqList
));
baseUnitLicences
.
addAll
(
baseUnitLicenceOne
);
}
});
List
<
Map
<
String
,
Object
>>
licences
=
baseUnitLicences
.
stream
().
map
(
e
->
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
BeanUtil
.
copyProperties
(
e
,
map
);
map
.
put
(
"licenceState"
,
String
.
valueOf
(
e
.
getLicenceState
()));
map
.
put
(
"qualificationCertificateAttachment"
,
JSONObject
.
parseArray
(
e
.
getQualificationCertificateAttachment
()));
return
map
;
}).
collect
(
Collectors
.
toList
());
return
licences
;
}
}
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