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
e099659a
Commit
e099659a
authored
Jan 22, 2024
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改造变更登记更换设备后保存,数据未更新成功问题修改。
parent
288eb62d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
JgRegistrationHistoryMapper.java
...oot/module/jg/api/mapper/JgRegistrationHistoryMapper.java
+3
-0
JgChangeRegistrationReformServiceImpl.java
...z/service/impl/JgChangeRegistrationReformServiceImpl.java
+6
-4
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgRegistrationHistoryMapper.java
View file @
e099659a
...
@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Select;
...
@@ -14,4 +14,7 @@ import org.apache.ibatis.annotations.Select;
public
interface
JgRegistrationHistoryMapper
extends
BaseMapper
<
JgRegistrationHistory
>
{
public
interface
JgRegistrationHistoryMapper
extends
BaseMapper
<
JgRegistrationHistory
>
{
@Select
(
"select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}"
)
@Select
(
"select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}"
)
Long
getSequenceNbrByEquidAndDocumentId
(
@Param
(
"equid"
)
String
equid
,
@Param
(
"documentId"
)
String
documentId
);
Long
getSequenceNbrByEquidAndDocumentId
(
@Param
(
"equid"
)
String
equid
,
@Param
(
"documentId"
)
String
documentId
);
@Select
(
"select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}"
)
Long
getSequenceNbrByRegistratioClassAndDocumentId
(
@Param
(
"registratioClass"
)
String
registratioClass
,
@Param
(
"documentId"
)
String
documentId
);
}
}
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/JgChangeRegistrationReformServiceImpl.java
View file @
e099659a
...
@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
...
@@ -52,6 +52,8 @@ import java.util.stream.Collectors;
*/
*/
@Service
@Service
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
{
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
{
private
final
static
String
bussinessType
=
"改造登记"
;
@Autowired
@Autowired
TzsServiceFeignClient
tzsServiceFeignClient
;
TzsServiceFeignClient
tzsServiceFeignClient
;
@Autowired
@Autowired
...
@@ -166,7 +168,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
...
@@ -166,7 +168,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
//使用登记编号
//使用登记编号
jgRegistrationHistory
.
setUseRegistrationCode
(
idxBizJgRegisterInfoMapper
.
getUseOrgCodeByEquip
(
equipId
));
jgRegistrationHistory
.
setUseRegistrationCode
(
idxBizJgRegisterInfoMapper
.
getUseOrgCodeByEquip
(
equipId
));
//登记类别
//登记类别
jgRegistrationHistory
.
setRegistrationClass
(
"改造登记"
);
jgRegistrationHistory
.
setRegistrationClass
(
bussinessType
);
//设备id
//设备id
jgRegistrationHistory
.
setEquId
(
equipId
);
jgRegistrationHistory
.
setEquId
(
equipId
);
//修改数据
//修改数据
...
@@ -188,7 +190,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
...
@@ -188,7 +190,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform
.
setSequenceNbr
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))));
jgChangeRegistrationReform
.
setSequenceNbr
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))));
this
.
getBaseMapper
().
updateById
(
jgChangeRegistrationReform
);
this
.
getBaseMapper
().
updateById
(
jgChangeRegistrationReform
);
jgChangeRegistrationReform
=
this
.
getBaseMapper
().
selectById
(
jgChangeRegistrationReform
.
getSequenceNbr
());
jgChangeRegistrationReform
=
this
.
getBaseMapper
().
selectById
(
jgChangeRegistrationReform
.
getSequenceNbr
());
jgRegistrationHistory
.
setSequenceNbr
(
jgRegistrationHistoryMapper
.
getSequenceNbrBy
EquidAndDocumentId
(
equipId
,
String
.
valueOf
(
map
.
get
(
"applyNo"
))));
jgRegistrationHistory
.
setSequenceNbr
(
jgRegistrationHistoryMapper
.
getSequenceNbrBy
RegistratioClassAndDocumentId
(
bussinessType
,
String
.
valueOf
(
map
.
get
(
"applyNo"
))));
jgRegistrationHistoryMapper
.
updateById
(
jgRegistrationHistory
);
jgRegistrationHistoryMapper
.
updateById
(
jgRegistrationHistory
);
}
else
{
}
else
{
//暂存处理
//暂存处理
...
@@ -442,7 +444,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
...
@@ -442,7 +444,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryMapper
.
selectOne
(
new
QueryWrapper
<
JgRegistrationHistory
>()
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryMapper
.
selectOne
(
new
QueryWrapper
<
JgRegistrationHistory
>()
.
eq
(
"equ_id"
,
equipId
)
.
eq
(
"equ_id"
,
equipId
)
.
eq
(
"current_document_id"
,
jgChangeRegistrationReform
.
getApplyNo
())
.
eq
(
"current_document_id"
,
jgChangeRegistrationReform
.
getApplyNo
())
.
eq
(
"registration_class"
,
"改造登记"
));
.
eq
(
"registration_class"
,
bussinessType
));
originalData
=
JSONObject
.
parseObject
(
jgRegistrationHistory
.
getChangeData
(),
Map
.
class
);
originalData
=
JSONObject
.
parseObject
(
jgRegistrationHistory
.
getChangeData
(),
Map
.
class
);
detail
.
putAll
(
originalData
);
detail
.
putAll
(
originalData
);
}
}
...
@@ -487,7 +489,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
...
@@ -487,7 +489,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryMapper
.
selectOne
(
new
QueryWrapper
<
JgRegistrationHistory
>()
JgRegistrationHistory
jgRegistrationHistory
=
jgRegistrationHistoryMapper
.
selectOne
(
new
QueryWrapper
<
JgRegistrationHistory
>()
.
eq
(
"equ_id"
,
equipId
)
.
eq
(
"equ_id"
,
equipId
)
.
eq
(
"current_document_id"
,
applyNo
)
.
eq
(
"current_document_id"
,
applyNo
)
.
eq
(
"registration_class"
,
"改造登记"
));
.
eq
(
"registration_class"
,
bussinessType
));
if
(!
ObjectUtils
.
isEmpty
(
idxBizJgTechParamsElevator
)
&&
!
ObjectUtils
.
isEmpty
(
jgRegistrationHistory
))
{
if
(!
ObjectUtils
.
isEmpty
(
idxBizJgTechParamsElevator
)
&&
!
ObjectUtils
.
isEmpty
(
jgRegistrationHistory
))
{
//历史数据
//历史数据
...
...
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