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
25a06649
Commit
25a06649
authored
May 08, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
708a6837
9f0b9672
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
EkpSocialInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
+10
-10
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+2
-1
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+1
-1
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @
25a06649
...
@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
...
@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
EkpSocialInfo
socialCount
;
EkpSocialInfo
socialCount
;
//获取社保订单明细合计
//获取社保订单明细合计
EkpSocialSumInfoVo
socialSumInfo
=
baseMapper
.
getCostSumInfo
(
idCard
,
month
);
EkpSocialSumInfoVo
socialSumInfo
=
baseMapper
.
getCostSumInfo
(
idCard
,
dateStringInsert
(
month
)
);
//预估单位合计
//预估单位合计
BigDecimal
ygDwSum
=
Common
.
isEmpty
(
socialSumInfo
)
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialSumInfo
.
getYgDwSum
());
BigDecimal
ygDwSum
=
Common
.
isEmpty
(
socialSumInfo
)
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialSumInfo
.
getYgDwSum
());
//实缴单位合计
//实缴单位合计
...
@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
...
@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfoList
.
add
(
socialInfo
);
socialInfoList
.
add
(
socialInfo
);
//金额累加
//金额累加
//预估单位合计
//预估单位合计
ygDwSum
=
ygDwSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb4e8064a8
()));
ygDwSum
=
ygDwSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3adfeb4e8064a8
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb4e8064a8
()));
//实缴单位合计
//实缴单位合计
sjDwSum
=
sjDwSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2e9208e4e
()));
sjDwSum
=
sjDwSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f2e9208e4e
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2e9208e4e
()));
//实缴个人合计
//实缴个人合计
sjPersonSum
=
sjPersonSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f303037214
()));
sjPersonSum
=
sjPersonSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f303037214
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f303037214
()));
//预估合计
//预估合计
ygSum
=
ygSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2883941b4
()));
ygSum
=
ygSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f2883941b4
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2883941b4
()));
//预估个人合计
//预估个人合计
ygPersonSum
=
ygPersonSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f285ee1e38
()));
ygPersonSum
=
ygPersonSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f285ee1e38
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f285ee1e38
()));
//实缴合计
//实缴合计
sjSum
=
sjSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f3059e5b9c
()));
sjSum
=
sjSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f3059e5b9c
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f3059e5b9c
()));
//应收
//应收
ys
=
ys
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb7b624f06
()));
ys
=
ys
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3adfeb7b624f06
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb7b624f06
()));
//个人应收
//个人应收
personYs
=
personYs
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57aee1428
()));
personYs
=
personYs
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3b35a57aee1428
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57aee1428
()));
//单位应收
//单位应收
dwYs
=
dwYs
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57b6e9d0a
()));
dwYs
=
dwYs
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3b35a57b6e9d0a
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57b6e9d0a
()));
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialParam
.
getYgFlag
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialParam
.
getYgFlag
()))
{
stringBuilder
.
append
(
socialParam
.
getSocialIds
()).
append
(
","
);
stringBuilder
.
append
(
socialParam
.
getSocialIds
()).
append
(
","
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
25a06649
...
@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
socialInfo
.
setDispatchId
(
disExist
.
getId
());
socialInfo
.
setDispatchId
(
disExist
.
getId
());
}
}
// 加流程进展明细
// 加流程进展明细
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
,
CommonConstants
.
TWO_STRING
);
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
,
CommonConstants
.
ONE_STRING
);
return
R
.
ok
(
"成功"
);
return
R
.
ok
(
"成功"
);
}
else
{
}
else
{
return
R
.
failed
(
"状态未变更,请刷新后查看列表状态!"
);
return
R
.
failed
(
"状态未变更,请刷新后查看列表状态!"
);
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
25a06649
...
@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
...
@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List
<
String
>
list2
=
list
.
stream
().
map
(
PersonVo:
:
getUid
).
collect
(
Collectors
.
toList
());
List
<
String
>
list2
=
list
.
stream
().
map
(
PersonVo:
:
getUid
).
collect
(
Collectors
.
toList
());
List
<
String
>
collect
=
list1
.
stream
().
filter
(
s
->
!
list2
.
contains
(
s
)
List
<
String
>
collect
=
list1
.
stream
().
filter
(
s
->
!
list2
.
contains
(
s
)
).
collect
(
Collectors
.
toList
());
).
collect
(
Collectors
.
toList
());
log
.
error
(
"要重置为不可用的用户列表:"
+
collect
);
if
(!
collect
.
isEmpty
())
{
if
(!
collect
.
isEmpty
())
{
log
.
error
(
"要重置为不可用的用户列表:"
+
collect
);
LambdaUpdateWrapper
<
SysUser
>
settleUpdate
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
SysUser
>
settleUpdate
=
new
LambdaUpdateWrapper
<>();
settleUpdate
.
in
(
SysUser:
:
getUsername
,
collect
)
settleUpdate
.
in
(
SysUser:
:
getUsername
,
collect
)
.
set
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ONE_STRING
);
.
set
(
SysUser:
:
getDelFlag
,
CommonConstants
.
ONE_STRING
);
...
...
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