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
ac0d7738
Commit
ac0d7738
authored
Jun 12, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑):bug修复
1.使用登记审批完成时按照json更新技术参数、设计信息、安装信息 2管道es增加使用登记证编号
parent
efc5a214
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
1 deletion
+41
-1
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+41
-1
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/JgUseRegistrationServiceImpl.java
View file @
ac0d7738
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
...
@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.map.MapBuilder
;
import
cn.hutool.core.map.MapBuilder
;
import
cn.hutool.core.map.MapUtil
;
import
cn.hutool.core.map.MapUtil
;
...
@@ -1198,6 +1199,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1198,6 +1199,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
}
}
if
(!
CollectionUtils
.
isEmpty
(
equipmentLists
))
{
if
(!
CollectionUtils
.
isEmpty
(
equipmentLists
))
{
// 装置更新管道的技术参数、设计信息、安装信息
if
(
jgProjectContraption
!=
null
){
updatePieLineTechAndInspection
(
equipmentLists
);
}
for
(
int
i
=
0
;
i
<
equipmentLists
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
equipmentLists
.
size
();
i
++)
{
Map
<
String
,
Object
>
equipment
=
equipmentLists
.
get
(
i
);
Map
<
String
,
Object
>
equipment
=
equipmentLists
.
get
(
i
);
// 设备ID
// 设备ID
...
@@ -1216,7 +1221,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1216,7 +1221,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
otherInfo
.
setSupervisoryCode
(
jgProjectContraption
.
getSupervisoryCode
());
otherInfo
.
setSupervisoryCode
(
jgProjectContraption
.
getSupervisoryCode
());
registerInfo
.
setEquCode
(
jgProjectContraption
.
getEquCode
());
registerInfo
.
setEquCode
(
jgProjectContraption
.
getEquCode
());
}
}
// 压力管道:[更新的原始引用]更新检验日期-nextInspectDate、检验结论-inspectConclusion、检验机构名称-inspectOrgName
// 压力管道:[更新的原始引用]更新检验日期-nextInspectDate、检验结论-inspectConclusion、检验机构名称-inspectOrgName
// equipment.put("nextInspectDate", mapData.getOrDefault("nextInspectDate", ""));
// equipment.put("nextInspectDate", mapData.getOrDefault("nextInspectDate", ""));
// equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
// equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
...
@@ -1263,6 +1267,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1263,6 +1267,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
commonServiceImpl
.
saveExecuteFlowData2Redis
(
jgUseRegistration
.
getInstanceId
(),
this
.
buildInstanceRuntimeData
(
jgUseRegistration
));
commonServiceImpl
.
saveExecuteFlowData2Redis
(
jgUseRegistration
.
getInstanceId
(),
this
.
buildInstanceRuntimeData
(
jgUseRegistration
));
}
}
/**
* 管道的技术参数及检验信息更新
* @return 更新的管道信息
*/
private
void
updatePieLineTechAndInspection
(
List
<
Map
<
String
,
Object
>>
piePines
)
{
for
(
Map
<
String
,
Object
>
piePine
:
piePines
)
{
JSONObject
item
=
JSONObject
.
parseObject
(
JSON
.
toJSONString
(
piePine
));
IdxBizJgTechParamsPipeline
pipeline
=
new
IdxBizJgTechParamsPipeline
();
pipeline
.
setMedium
(
item
.
getString
(
"medium"
));
pipeline
.
setPressure
(
item
.
getString
(
"pressure"
));
pipeline
.
setNominalDiameter
(
item
.
getString
(
"nominalDiameter"
));
pipeline
.
setTemperature
(
item
.
getString
(
"temperature"
));
pipeline
.
setWallThickness
(
item
.
getString
(
"wallThickness"
));
pipeline
.
setWorkMedium
(
item
.
getString
(
"workMedium"
));
pipeline
.
setWorkPressure
(
item
.
getString
(
"workPressure"
));
pipeline
.
setWorkTemperature
(
item
.
getString
(
"workTemperature"
));
pipeline
.
setPipeLength
(
item
.
getString
(
"pipeLength"
));
LambdaUpdateWrapper
<
IdxBizJgTechParamsPipeline
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
IdxBizJgTechParamsPipeline:
:
getRecord
,
item
.
getString
(
"record"
));
// 技术参数修改
idxBizJgTechParamsPipelineServiceImpl
.
update
(
pipeline
,
updateWrapper
);
// 设计单位名称修改
LambdaUpdateWrapper
<
IdxBizJgDesignInfo
>
lambdaDes
=
new
LambdaUpdateWrapper
<>();
lambdaDes
.
eq
(
IdxBizJgDesignInfo:
:
getRecord
,
item
.
getString
(
"record"
));
lambdaDes
.
set
(
IdxBizJgDesignInfo:
:
getDesignUnitName
,
item
.
getString
(
"designUnitName"
));
idxBizJgDesignInfoService
.
update
(
lambdaDes
);
// 安装信息修改
if
(
item
.
getString
(
"constructionInfoSeq"
)
!=
null
)
{
IdxBizJgConstructionInfo
constructionInfo
=
idxBizJgConstructionInfoService
.
getById
(
item
.
getString
(
"constructionInfoSeq"
));
constructionInfo
.
setUscUnitName
(
item
.
getString
(
"uscUnitName"
));
constructionInfo
.
setUscDate
(
ValidationUtil
.
isEmpty
(
item
.
getString
(
"uscDate"
))
?
null
:
DateUtil
.
parse
(
item
.
getString
(
"uscDate"
),
DatePattern
.
NORM_MONTH_FORMAT
));
idxBizJgConstructionInfoService
.
getBaseMapper
().
updateById
(
constructionInfo
);
}
}
}
private
void
updateRegAndProjectContraption
(
JgUseRegistration
jgUseRegistration
,
JSONObject
mapData
,
IdxBizJgProjectContraption
jgProjectContraption
)
{
private
void
updateRegAndProjectContraption
(
JgUseRegistration
jgUseRegistration
,
JSONObject
mapData
,
IdxBizJgProjectContraption
jgProjectContraption
)
{
//总工程装置
//总工程装置
if
(!
StringUtils
.
isEmpty
(
jgProjectContraption
)){
if
(!
StringUtils
.
isEmpty
(
jgProjectContraption
)){
...
...
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