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
04e80df8
Commit
04e80df8
authored
Mar 11, 2025
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
27530 监管业务系统,历史无证压力管道使用登记时,监管审核人员查看详情,查看使用登记表预览,预览内容与上传的附件内容不符
parent
c6bab10a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+7
-3
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/CommonServiceImpl.java
View file @
04e80df8
...
...
@@ -2260,10 +2260,14 @@ public class CommonServiceImpl implements ICommonService {
DateTimeFormatter
inputFormatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
DateTimeFormatter
outputFormatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
);
Pattern
timePattern
=
Pattern
.
compile
(
"\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}"
);
//如果是历史无证的修改类型为SP_TT并且枚举没有在登记类型中
if
(
Objects
.
isNull
(
RegistrationTypeEnum
.
getNameByType
(
formData
.
getString
(
"type"
)))
&&
"jg_his_black"
.
equals
(
formData
.
getString
(
"dataSource"
))){
formData
.
put
(
"type"
,
"SP_TT"
);
}
//登记类型
if
(
jsonObject
.
containsKey
(
"type"
)){
formData
.
put
(
"registrationType"
,
RegistrationTypeEnum
.
getNameByType
(
jsonObject
.
getString
(
"type"
)));
if
(
formData
.
containsKey
(
"type"
)){
formData
.
put
(
"registrationType"
,
RegistrationTypeEnum
.
getNameByType
(
formData
.
getString
(
"type"
)));
}
for
(
String
key
:
formData
.
keySet
())
{
if
(
key
.
contains
(
"Date"
)
&&
timePattern
.
matcher
(
formData
.
getString
(
key
)).
matches
()){
...
...
@@ -2318,7 +2322,7 @@ public class CommonServiceImpl implements ICommonService {
.
map
(
obj
->
(
Map
<
String
,
Object
>)
obj
).
collect
(
Collectors
.
toList
());
if
(
manageType
.
equals
(
UNIT
)
&&
!
CollectionUtils
.
isEmpty
(
equips
)){
//管道计算的是管道长度
if
(
formData
.
containsKey
(
"equListCode"
)
&&
formData
.
getString
(
"equListCode"
).
equals
(
"8000"
)){
if
(
"8000"
.
equals
(
formData
.
getString
(
"equListCode"
))
||
"8000"
.
equals
(
formData
.
getString
(
"EQU_LIST_CODE"
)
)){
double
pipeLength
=
equips
.
stream
().
filter
(
Objects:
:
nonNull
)
.
filter
(
map
->
map
.
containsKey
(
"pipeLength"
)
&&
StringUtils
.
isNotEmpty
((
String
)
map
.
get
(
"pipeLength"
)))
.
mapToDouble
(
map
->
Double
.
parseDouble
((
String
)
map
.
get
(
"pipeLength"
)))
...
...
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