Commit 96b315e2 authored by hongguangwu's avatar hongguangwu

MVP1.4-B端社保、档案

parent 426df849
......@@ -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());
// 处理退费
......
......@@ -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">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment