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
96b315e2
Commit
96b315e2
authored
Jan 18, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.4-B端社保、档案
parent
426df849
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
21 deletions
+45
-21
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+43
-21
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
96b315e2
...
...
@@ -3452,6 +3452,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
for
(
TPaymentInfoVo
infoVo:
paymentAllInfoVoList
){
if
(
Common
.
isNotNull
(
infoVo
.
getSocialPayMonth
())){
pageVo
.
setMonth
(
infoVo
.
getSocialPayMonth
());
}
else
{
pageVo
.
setMonth
(
infoVo
.
getProvidentPayMonth
());
}
pageVo
.
setEmpId
(
infoVo
.
getEmpId
());
// 处理退费
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
96b315e2
...
...
@@ -1501,7 +1501,7 @@
AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
</if>
<if
test=
"tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"
>
AND
a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
AND
(a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth} or a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.socialPayMonth})
</if>
<if
test=
"tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"
>
AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
...
...
@@ -1596,7 +1596,7 @@
<select
id=
"getSocialAndFundBusinessDataPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialAndFundBusinessPageVo"
>
SELECT
a.SOCIAL_PAY_MONTH
as 'month',
ifnull(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH)
as 'month',
a.SETTLE_DOMAIN_ID as 'settleDomainId',
SUM(
IF(a.PERSONAL_ACCRUAL,a.PERSONAL_ACCRUAL,0) +
...
...
@@ -1624,21 +1624,42 @@
AND a.SETTLE_DOMAIN_ID = #{socialAndFundBusinessPageVo.settleDomainId}
</if>
<if
test=
"socialAndFundBusinessPageVo.year != null and socialAndFundBusinessPageVo.year.trim() != ''"
>
AND a.SOCIAL_PAY_MONTH in(
CONCAT(#{socialAndFundBusinessPageVo.year},'01'),
CONCAT(#{socialAndFundBusinessPageVo.year},'02'),
CONCAT(#{socialAndFundBusinessPageVo.year},'03'),
CONCAT(#{socialAndFundBusinessPageVo.year},'04'),
CONCAT(#{socialAndFundBusinessPageVo.year},'05'),
CONCAT(#{socialAndFundBusinessPageVo.year},'06'),
CONCAT(#{socialAndFundBusinessPageVo.year},'07'),
CONCAT(#{socialAndFundBusinessPageVo.year},'08'),
CONCAT(#{socialAndFundBusinessPageVo.year},'09'),
CONCAT(#{socialAndFundBusinessPageVo.year},'10'),
CONCAT(#{socialAndFundBusinessPageVo.year},'11'),
CONCAT(#{socialAndFundBusinessPageVo.year},'12')
AND (
(
a.SOCIAL_PAY_MONTH in(
CONCAT(#{socialAndFundBusinessPageVo.year},'01'),
CONCAT(#{socialAndFundBusinessPageVo.year},'02'),
CONCAT(#{socialAndFundBusinessPageVo.year},'03'),
CONCAT(#{socialAndFundBusinessPageVo.year},'04'),
CONCAT(#{socialAndFundBusinessPageVo.year},'05'),
CONCAT(#{socialAndFundBusinessPageVo.year},'06'),
CONCAT(#{socialAndFundBusinessPageVo.year},'07'),
CONCAT(#{socialAndFundBusinessPageVo.year},'08'),
CONCAT(#{socialAndFundBusinessPageVo.year},'09'),
CONCAT(#{socialAndFundBusinessPageVo.year},'10'),
CONCAT(#{socialAndFundBusinessPageVo.year},'11'),
CONCAT(#{socialAndFundBusinessPageVo.year},'12')
)
AND a.SOCIAL_PAY_MONTH >= CONCAT(#{socialAndFundBusinessPageVo.year},'01')
) or
(
a.PROVIDENT_PAY_MONTH in (
CONCAT(#{socialAndFundBusinessPageVo.year},'01'),
CONCAT(#{socialAndFundBusinessPageVo.year},'02'),
CONCAT(#{socialAndFundBusinessPageVo.year},'03'),
CONCAT(#{socialAndFundBusinessPageVo.year},'04'),
CONCAT(#{socialAndFundBusinessPageVo.year},'05'),
CONCAT(#{socialAndFundBusinessPageVo.year},'06'),
CONCAT(#{socialAndFundBusinessPageVo.year},'07'),
CONCAT(#{socialAndFundBusinessPageVo.year},'08'),
CONCAT(#{socialAndFundBusinessPageVo.year},'09'),
CONCAT(#{socialAndFundBusinessPageVo.year},'10'),
CONCAT(#{socialAndFundBusinessPageVo.year},'11'),
CONCAT(#{socialAndFundBusinessPageVo.year},'12')
)
AND a.PROVIDENT_PAY_MONTH >= CONCAT(#{socialAndFundBusinessPageVo.year},'01')
)
)
AND a.SOCIAL_PAY_MONTH >= CONCAT(#{socialAndFundBusinessPageVo.year},'01')
</if>
</if>
<if
test=
"settleDomainIds != null and settleDomainIds.size > 0"
>
...
...
@@ -1648,7 +1669,7 @@
</foreach>
</if>
GROUP BY
a.SOCIAL_PAY_MONTH
desc
ifnull(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH)
desc
</where>
</select>
...
...
@@ -1658,7 +1679,7 @@
SELECT x.SOCIAL_PAY_MONTH as 'month',COUNT(DISTINCT x.EMP_IDCARD) as 'peopleCount' FROM
(
SELECT
a.
SOCIAL_PAY_MONTH,
ifnull(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH)
SOCIAL_PAY_MONTH,
a.EMP_IDCARD
FROM
t_payment_info a
...
...
@@ -1669,7 +1690,8 @@
AND a.SETTLE_DOMAIN_ID = #{socialAndFundBusinessPageVo.settleDomainId}
</if>
<if
test=
"socialAndFundBusinessPageVo.year != null and socialAndFundBusinessPageVo.year.trim() != ''"
>
AND a.SOCIAL_PAY_MONTH like CONCAT(#{socialAndFundBusinessPageVo.year},'%')
AND (a.SOCIAL_PAY_MONTH like CONCAT(#{socialAndFundBusinessPageVo.year},'%')
or a.PROVIDENT_PAY_MONTH like CONCAT(#{socialAndFundBusinessPageVo.year},'%'))
</if>
</if>
<if
test=
"settleDomainIds != null and settleDomainIds.size > 0"
>
...
...
@@ -1731,7 +1753,7 @@
SELECT
a.EMP_NAME as 'empName',
a.EMP_ID as 'empId',
a.SOCIAL_PAY_MONTH
as 'month',
ifnull(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH)
as 'month',
SUM(
IF(a.PERSONAL_ACCRUAL,a.PERSONAL_ACCRUAL,0) +
IF(a.PERSONAL_BIGMAILMENT_MONEY,a.PERSONAL_BIGMAILMENT_MONEY,0) +
...
...
@@ -1780,7 +1802,7 @@
AND a.SETTLE_DOMAIN_ID = #{paymentBusinessPageVo.settleDomainId}
</if>
<if
test=
"paymentBusinessPageVo.month != null and paymentBusinessPageVo.month.trim() != ''"
>
AND
a.SOCIAL_PAY_MONTH = #{paymentBusinessPageVo.month}
AND
(a.SOCIAL_PAY_MONTH = #{paymentBusinessPageVo.month} or a.PROVIDENT_PAY_MONTH = #{paymentBusinessPageVo.month})
</if>
</if>
<if
test=
"settleDomainIds != null and settleDomainIds.size > 0"
>
...
...
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