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
f5b88ae7
Commit
f5b88ae7
authored
Dec 09, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(流程执行适配):支持多公司
1.代码还原
parent
edc1a018
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
23 deletions
+1
-23
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+1
-23
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 @
f5b88ae7
...
...
@@ -2238,7 +2238,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if
(
WorkFlowStatusEnum
.
USE_RECEIVE
.
getPass
().
equals
(
jgUseRegistration
.
getStatus
()))
{
// 一级驳回到使用单位
dto
.
setNextExecuteUserCompanyCode
(
jgUseRegistration
.
getUseUnitCreditCode
());
dto
.
setNextExecuteUserOrgCode
(
jgUseRegistration
.
getUseUnitCreditCode
()
);
dto
.
setNextExecuteUserOrgCode
(
null
);
}
//特殊登记,安全监察驳回到一级
if
(
"2"
.
equals
(
jgUseRegistration
.
getRegType
()))
{
...
...
@@ -2275,28 +2275,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if
(
"2"
.
equals
(
jgUseRegistration
.
getRegType
())
&&
(
WorkFlowStatusEnum
.
USE_RECEIVE
.
getPass
().
equals
(
jgUseRegistration
.
getStatus
())
||
WorkFlowStatusEnum
.
USE_RECEIVE
.
getRollBack
().
equals
(
jgUseRegistration
.
getStatus
())
||
WorkFlowStatusEnum
.
USE_RECEIVE
.
getReject
().
equals
(
jgUseRegistration
.
getStatus
())
))
{
List
<
AgencyUserModel
>
taskExecutor
=
Privilege
.
agencyUserClient
.
queryByRoleId
(
String
.
join
(
","
,
JIAN_CHA_ROLE_ID
),
null
,
true
,
true
,
""
,
buildOrgCodePrefixes
(
orgCode
)).
getResult
();
if
(!
ValidationUtil
.
isEmpty
(
taskExecutor
))
{
Optional
<
String
>
companyCodeOpt
=
taskExecutor
.
stream
()
.
map
(
AgencyUserModel:
:
getCompanys
)
.
filter
(
list
->
list
!=
null
&&
!
list
.
isEmpty
())
.
flatMap
(
List:
:
stream
)
.
filter
(
c
->
"county"
.
equalsIgnoreCase
(
c
.
getLevel
()))
.
map
(
CompanyModel:
:
getCompanyCode
)
.
findFirst
();
if
(!
companyCodeOpt
.
isPresent
())
{
companyCodeOpt
=
taskExecutor
.
stream
()
.
map
(
AgencyUserModel:
:
getCompanys
)
.
filter
(
list
->
list
!=
null
&&
!
list
.
isEmpty
())
.
flatMap
(
List:
:
stream
)
.
filter
(
c
->
"prefecture-level"
.
equalsIgnoreCase
(
c
.
getLevel
()))
.
map
(
CompanyModel:
:
getCompanyCode
)
.
findFirst
();
}
companyCodeOpt
.
ifPresent
(
dto:
:
setNextExecuteUserCompanyCode
);
}
dto
.
setResultCode
(
"approvalStatus"
);
map
.
put
(
"approvalStatus"
,
"9"
);
map
.
put
(
"nextExecuteUserOrgCode"
,
orgCode
);
...
...
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