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
c7a9d260
Commit
c7a9d260
authored
Sep 27, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):移装变更登记添加其他附件
parent
98ab5977
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
JgChangeRegistrationTransferDto.java
...ot/module/jg/api/dto/JgChangeRegistrationTransferDto.java
+2
-0
JgChangeRegistrationTransfer.java
...ot/module/jg/api/entity/JgChangeRegistrationTransfer.java
+6
-0
JgChangeRegistrationTransferServiceImpl.java
...service/impl/JgChangeRegistrationTransferServiceImpl.java
+6
-0
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/dto/JgChangeRegistrationTransferDto.java
View file @
c7a9d260
...
...
@@ -160,5 +160,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
@ApiModelProperty
(
value
=
" 转办后执行人的Id逗号分割"
)
private
String
transferToUserIds
;
@ApiModelProperty
(
value
=
"其他附件"
)
private
String
otherAccessories
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransfer.java
View file @
c7a9d260
...
...
@@ -261,4 +261,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
*/
@TableField
(
"transfer_type"
)
private
String
transferType
;
/**
* 其他附件
*/
@TableField
(
value
=
"other_accessories"
)
private
String
otherAccessories
;
}
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/JgChangeRegistrationTransferServiceImpl.java
View file @
c7a9d260
...
...
@@ -325,6 +325,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//设备移装详细地址
oldTransfer
.
setFullAddress
(
fullAddress
);
oldTransfer
.
setTransferType
((
String
)
tableData
.
get
(
"transferType"
));
if
(!
ObjectUtils
.
isEmpty
(
tableData
.
get
(
"otherAccessories"
)))
{
oldTransfer
.
setOtherAccessories
(
JSONObject
.
toJSONString
(
tableData
.
get
(
"otherAccessories"
)));
}
//保存【移装变更登记】基本信息
if
(!
ValidationUtil
.
isEmpty
(
oldTransfer
))
{
...
...
@@ -648,6 +651,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
resultDataMap
.
put
(
"receiveCompanyCode"
,
transfer
.
getReceiveCompanyCode
()
+
"_"
+
transfer
.
getReceiveOrgName
());
resultDataMap
.
put
(
"registrationList"
,
newRegistrationList
);
}
if
(!
ObjectUtils
.
isEmpty
(
resultDataMap
.
get
(
"otherAccessories"
)))
{
resultDataMap
.
put
(
"otherAccessories"
,
JSONObject
.
parse
(
resultDataMap
.
get
(
"otherAccessories"
).
toString
()));
}
String
transferSafetyManager
=
Optional
.
ofNullable
(
resultDataMap
.
get
(
"transferSafetyManager"
)).
orElse
(
""
).
toString
();
if
(
StringUtil
.
isNotEmpty
(
transferSafetyManager
))
{
String
[]
transferSafetyManagerList
=
transferSafetyManager
.
split
(
"_"
);
...
...
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