Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
7cc64d1a
Commit
7cc64d1a
authored
Dec 29, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保公积金派减增加申请节点审核记录-fxj
parent
5fd3e7cb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
9 deletions
+21
-9
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+21
-9
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
7cc64d1a
...
...
@@ -2141,15 +2141,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialBases
.
clear
();
}
if
(
Common
.
isNotNull
(
fundHolds
))
{
List
<
SysBaseSetInfo
>
fundBases
=
baseSetMapper
.
selectList
(
Wrappers
.<
SysBaseSetInfo
>
query
().
lambda
()
.
eq
(
SysBaseSetInfo:
:
getBaseType
,
CommonConstants
.
ONE_STRING
)
.
le
(
SysBaseSetInfo:
:
getApplyStartDate
,
now
)
.
in
(
SysBaseSetInfo:
:
getDepartName
,
fundHolds
)
.
eq
(
SysBaseSetInfo:
:
getStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysBaseSetInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
isNull
(
SysBaseSetInfo:
:
getApplyEndDate
).
or
().
ge
(
SysBaseSetInfo:
:
getApplyEndDate
,
now
))
.
groupBy
(
SysBaseSetInfo:
:
getDepartName
));
//baseSetMapper.getFundBaseSet(fundHolds);
List
<
SysBaseSetInfo
>
fundBases
=
baseSetMapper
.
getFundBaseSet
(
fundHolds
);
if
(
Common
.
isNotNull
(
fundBases
))
{
for
(
SysBaseSetInfo
set
:
fundBases
)
{
fundHoldMap
.
put
(
set
.
getDepartName
(),
set
);
...
...
@@ -3257,6 +3249,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 是否SSC:SSC派单组-1659015946137583618L SSC审核组-1659016108176130049L
long
roleId
=
1659015946137583618L
;
boolean
isSsc
=
haveRole
(
user
,
roleId
);
StringBuilder
remarkTemp
;
TAuditInfo
auditInfo
;
// 执行数据插入操作 组装
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
socialFund
=
null
;
...
...
@@ -3324,7 +3318,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
isSsc
)
{
dispatch
.
setStatus
(
CommonConstants
.
FIVE_STRING
);
}
auditInfo
=
new
TAuditInfo
();
remarkTemp
=
new
StringBuilder
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
dispatch
.
getSocialId
())){
remarkTemp
.
append
(
"社保"
);
}
if
(
Common
.
isNotNull
(
dispatch
.
getFundId
())){
if
(
remarkTemp
.
length
()
>
0
)
{
remarkTemp
.
append
(
"、公积金"
);
}
else
{
remarkTemp
.
append
(
"公积金"
);
}
}
remarkTemp
.
append
(
"派减申请:"
);
initAuditInfo
(
auditInfo
,
remarkTemp
.
toString
(),
CommonConstants
.
ZERO_STRING
,
user
,
remarkTemp
.
toString
(),
null
);
baseMapper
.
insert
(
dispatch
);
auditInfo
.
setEmpIdcard
(
dispatch
.
getEmpIdcard
());
auditInfo
.
setDispatchInfoId
(
dispatch
.
getId
());
auditInfo
.
setDispatchInfoId
(
dispatch
.
getId
());
auditInfoMapper
.
insert
(
auditInfo
);
//是否同步减档减项减合同未是时新增任务处理表
if
(
Common
.
isNotNull
(
dispatch
.
getChangeContractAndEmployee
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
dispatch
.
getChangeContractAndEmployee
()))
{
...
...
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