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
69898d97
Commit
69898d97
authored
Jul 16, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):台套的历史设备登记报错修改
parent
9d61e0bd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+4
-4
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 @
69898d97
...
...
@@ -2676,7 +2676,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private
void
historyEquUpdateMaintenanceInfo
(
JSONObject
map
){
SimpleDateFormat
format
=
new
SimpleDateFormat
();
IdxBizJgMaintenanceRecordInfo
info
=
idxBizJgMaintenanceRecordInfoService
.
queryNewestDetailByRecord
(
String
.
valueOf
(
map
.
get
(
"equipId"
)));
if
(!
ValidationUtil
.
isEmpty
(
info
))
{
if
(!
ValidationUtil
.
isEmpty
(
info
.
getSequenceNbr
()
))
{
info
.
setMeUnitName
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"meUnitName"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"meUnitName"
)).
split
(
"_"
)[
1
]);
info
.
setMeUnitCreditCode
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"meUnitName"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"meUnitName"
)).
split
(
"_"
)[
0
]);
info
.
setMeMaster
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"meMaster"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"meMaster"
)));
...
...
@@ -2693,9 +2693,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
log
.
info
(
"date转化失败"
);
}
info
.
setRepairInform
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"repairInform"
))
?
null
:
JSONObject
.
toJSONString
(
map
.
get
(
"repairInform"
)));
}
idxBizJgMaintenanceRecordInfoService
.
getBaseMapper
().
updateById
(
info
);
}
}
/**
* 历史设备登记-》更新安装信息
...
...
@@ -2703,7 +2703,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private
void
historyEquUpdateInstallInfo
(
JSONObject
map
){
IdxBizJgConstructionInfo
constructionInfo
=
idxBizJgConstructionInfoService
.
queryNewestDetailByRecord
(
String
.
valueOf
(
map
.
get
(
"equipId"
)));
if
(!
ValidationUtil
.
isEmpty
(
constructionInfo
))
{
if
(!
ValidationUtil
.
isEmpty
(
constructionInfo
.
getSequenceNbr
()
))
{
constructionInfo
.
setUscUnitCreditCode
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"uscUnitCodeAndName"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"uscUnitCodeAndName"
)).
split
(
"_"
)[
0
]);
constructionInfo
.
setUscUnitName
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"uscUnitCodeAndName"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"uscUnitCodeAndName"
)).
split
(
"_"
)[
1
]);
constructionInfo
.
setConstructionLeaderName
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"installLeaderId"
))
?
null
:
String
.
valueOf
(
map
.
get
(
"installLeaderId"
)));
...
...
@@ -2711,9 +2711,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
constructionInfo
.
setProxyStatementAttachment
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"proxyStatementAttachmentList"
))
?
null
:
JSONObject
.
toJSONString
(
map
.
get
(
"proxyStatementAttachmentList"
)));
constructionInfo
.
setConstructionContractAttachment
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"installContractAttachment"
))
?
null
:
JSONObject
.
toJSONString
(
map
.
get
(
"installContractAttachment"
)));
constructionInfo
.
setConstructionOtherAccessories
(
ValidationUtil
.
isEmpty
(
map
.
get
(
"insOtherAccessories"
))
?
null
:
JSONObject
.
toJSONString
(
map
.
get
(
"insOtherAccessories"
)));
}
idxBizJgConstructionInfoService
.
getBaseMapper
().
updateById
(
constructionInfo
);
}
}
private
void
historyEquGenManageRelated
(
JSONObject
map
,
JgUseRegistration
jgUseRegistration
,
IdxBizJgRegisterInfo
registerInfo
,
IdxBizJgFactoryInfo
idxBizJgFactoryInfo
){
...
...
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