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
95d2b592
Commit
95d2b592
authored
Jan 12, 2024
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加字段
parent
c6e8a7ce
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
JgUseRegistration.java
...oin/amos/boot/module/jg/api/entity/JgUseRegistration.java
+3
-0
JgUseRegistrationMapper.xml
...api/src/main/resources/mapper/JgUseRegistrationMapper.xml
+2
-1
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+3
-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/entity/JgUseRegistration.java
View file @
95d2b592
...
...
@@ -180,4 +180,7 @@ public class JgUseRegistration extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
equipId
;
@TableField
(
value
=
"next_execute_user_ids"
)
private
String
nextExecuteUserIds
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @
95d2b592
...
...
@@ -28,7 +28,8 @@
ur.supervisory_code as supervisoryCode,
ur.use_registration_code as useRegistrationCode,
date_format(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
ur.receive_org_name as receiveOrgName
ur.receive_org_name as receiveOrgName,
ur.next_execute_user_ids as nextExecuteUserIds
from tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
...
...
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 @
95d2b592
...
...
@@ -254,6 +254,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgUseRegistrationEq
jgUseRegistrationEq
=
jgRelationEquipMapper
.
selectOne
(
eq
);
jgUseRegistration
.
setEquipId
(
jgUseRegistrationEq
.
getEquId
());
jgUseRegistration
.
setNextTaskId
(
workflowResultDto
.
getNextTaskId
());
jgUseRegistration
.
setNextExecuteUserIds
(
workflowResultDto
.
getNextExecutorUserIds
());
if
(
isFirst
)
{
jgUseRegistration
.
setInstanceStatus
(
workflowResultDto
.
getExecutorRoleIds
());
jgUseRegistration
.
setInstanceId
(
workflowResultDto
.
getInstanceId
());
...
...
@@ -423,6 +424,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
else
{
// 流程结束
jgUseRegistration
.
setStatus
(
taskCode
);
jgUseRegistration
.
setNextExecuteUserIds
(
null
);
if
(!
ObjectUtils
.
isEmpty
(
jgUseRegistration
.
getSupervisoryCode
()))
{
// 生成使用登记证编号
jgUseRegistration
.
setUseRegistrationCode
(
getCode
(
jgUseRegistration
.
getSupervisoryCode
()));
...
...
@@ -472,6 +474,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
taskCode
=
resultDto
.
get
(
0
).
getNextTaskCode
();
roles
=
resultDto
.
get
(
0
).
getNextExecutorRoleIds
();
jgUseRegistration
.
setNextTaskId
(
resultDto
.
get
(
0
).
getNextTaskId
());
jgUseRegistration
.
setNextExecuteUserIds
(
resultDto
.
get
(
0
).
getNextExecutorUserIds
());
}
LambdaQueryWrapper
<
JgUseRegistration
>
lambda
=
new
QueryWrapper
<
JgUseRegistration
>().
lambda
();
lambda
.
eq
(
JgUseRegistration:
:
getInstanceId
,
instanceId
);
...
...
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