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
f10ee4df
Commit
f10ee4df
authored
Jan 24, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):设备移交详情Bug修改,监管码为空给默认值
parent
9dfe3ebf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
JgEquipTransferServiceImpl.java
...odule/jg/biz/service/impl/JgEquipTransferServiceImpl.java
+3
-3
JgReformNoticeServiceImpl.java
...module/jg/biz/service/impl/JgReformNoticeServiceImpl.java
+3
-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/JgEquipTransferServiceImpl.java
View file @
f10ee4df
...
...
@@ -138,7 +138,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
private
TaskModelDto
buildTempTaskModelDto
(
JgEquipTransfer
item
)
{
return
TaskModelDto
.
builder
()
.
model
(
item
)
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
item
.
getSupervisoryCode
(
),
item
.
getApplyNo
()))
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
Objects
.
toString
(
item
.
getSupervisoryCode
(),
""
),
item
.
getApplyNo
()))
.
taskCode
(
item
.
getApplyNo
())
.
taskType
(
BusinessTypeEnum
.
JG_EQUIPMENT_HANDOVER
.
getCode
())
.
relationId
(
item
.
getSequenceNbr
()+
""
)
...
...
@@ -184,8 +184,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
.
taskStatusLabel
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getName
())
.
flowStatus
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getCode
())
.
flowStatusLabel
(
FlowStatusEnum
.
TO_BE_PROCESSED
.
getName
())
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
item
.
getSupervisoryCode
(
),
item
.
getApplyNo
()))
.
taskDesc
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
item
.
getSupervisoryCode
(
),
item
.
getApplyNo
()))
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
Objects
.
toString
(
item
.
getSupervisoryCode
(),
""
),
item
.
getApplyNo
()))
.
taskDesc
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
Objects
.
toString
(
item
.
getSupervisoryCode
(),
""
),
item
.
getApplyNo
()))
.
startUserId
(
item
.
getCreateUserId
())
.
startUser
(
item
.
getCreateUserName
())
.
startUserCompanyName
(
item
.
getCreateUserCompanyName
())
...
...
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/JgReformNoticeServiceImpl.java
View file @
f10ee4df
...
...
@@ -488,7 +488,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
private
TaskModelDto
buildTempTaskModelDto
(
JgReformNotice
item
)
{
return
TaskModelDto
.
builder
()
.
model
(
item
)
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
item
.
getSupervisoryCode
(
),
item
.
getApplyNo
()))
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
item
.
getEquList
(),
Objects
.
toString
(
item
.
getSupervisoryCode
(),
""
),
item
.
getApplyNo
()))
.
taskCode
(
item
.
getApplyNo
())
.
taskType
(
BusinessTypeEnum
.
JG_MODIFICATION_NOTIFICATION
.
getCode
())
.
relationId
(
item
.
getSequenceNbr
()+
""
)
...
...
@@ -813,8 +813,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
.
taskStatusLabel
(
statusEnum
.
getName
())
.
flowStatus
(
statusEnum
.
getCode
())
.
flowStatusLabel
(
statusEnum
.
getName
())
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
transfer
.
getEquList
(),
transfer
.
getSupervisoryCode
(
),
transfer
.
getApplyNo
()))
.
taskDesc
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
transfer
.
getEquList
(),
transfer
.
getSupervisoryCode
(
),
transfer
.
getApplyNo
()))
.
taskContent
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
transfer
.
getEquList
(),
Objects
.
toString
(
transfer
.
getSupervisoryCode
(),
""
),
transfer
.
getApplyNo
()))
.
taskDesc
(
String
.
format
(
"来自%s【%s】的业务办理,【申请单号:%s】"
,
transfer
.
getEquList
(),
Objects
.
toString
(
transfer
.
getSupervisoryCode
(),
""
),
transfer
.
getApplyNo
()))
.
startUserCompanyName
(
transfer
.
getCreateUserCompanyName
())
.
startUserId
(
taskV2Model
.
getStartUserId
())
.
startUser
(
taskV2Model
.
getStartUser
())
...
...
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