Skip to content

Y
yifu-mvp
Commit 11e62d9b authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 4074d687 51316284
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 13 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ 11e62d9b
......@@ -971,21 +971,21 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getMedical())) {
library.setPersonalMedicalFee(BigDecimalUtils.safeMultiply(library.getPersonalMedicalFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getMedical())) {
library.setPersonalMedicalFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getUnemployed())) {
library.setPersonalUnemploymentFee(BigDecimalUtils.safeMultiply(library.getPersonalUnemploymentFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getUnemployed())) {
library.setPersonalUnemploymentFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getPension())) {
library.setPersonalPensionFee(BigDecimalUtils.safeMultiply(library.getPersonalPensionFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getPension())) {
library.setPersonalPensionFee(BigDecimal.ZERO);
}
......@@ -1004,35 +1004,35 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getPension())) {
library.setUnitPensionFee(BigDecimalUtils.safeMultiply(library.getUnitPensionFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getPension())) {
library.setUnitPensionFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getMedical())) {
library.setUnitMedicalFee(BigDecimalUtils.safeMultiply(library.getUnitMedicalFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getMedical())) {
library.setUnitMedicalFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getBear())) {
library.setUnitBirthFee(BigDecimalUtils.safeMultiply(library.getUnitBirthFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getBear())) {
library.setUnitBirthFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getInjury())) {
library.setUnitWorkInjuryFee(BigDecimalUtils.safeMultiply(library.getUnitWorkInjuryFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getInjury())) {
library.setUnitWorkInjuryFee(BigDecimal.ZERO);
}
// 0 全额 1 减半 2 不收
if (CommonConstants.ONE_STRING.equals(agentConfig.getUnemployed())) {
library.setUnitUnemploymentFee(BigDecimalUtils.safeMultiply(library.getUnitUnemploymentFee()
, CommonConstants.HALF_OF_ONE, CommonConstants.TWO_BIG));
, CommonConstants.HALF_OF_ONE));
} else if (CommonConstants.TWO_STRING.equals(agentConfig.getUnemployed())) {
library.setUnitUnemploymentFee(BigDecimal.ZERO);
}
......@@ -1093,14 +1093,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if (CommonConstants.ZERO_STRING.equals(sysBaseSetInfo.getCollectType())) {
if ((null != sysBaseSetInfo.getCollectMoth()
&& Integer.parseInt(library.getSocialPayMonth().substring(4, 6)) == sysBaseSetInfo.getCollectMoth()
&& Integer.parseInt(library.getSocialPayMonth().substring(0, 4)) != socialInfo.getSocialStartDate().getYear())
|| library.getSocialPayMonth().equals(DateUtil.formatDatePatten(socialInfo.getSocialStartDate(), null))) {
&& Integer.parseInt(library.getSocialPayMonth().substring(0, 4)) != socialInfo.getBigailmentStart().getYear())
|| library.getSocialPayMonth().equals(DateUtil.formatDatePatten(socialInfo.getBigailmentStart(), null))) {
// 大病取值方式：0按定值
library.setUnitBitailmentFee(BigDecimalUtils.isNullToZero(sysBaseSetInfo.getPayCompany()));
library.setPersonalBigailmentFee(BigDecimalUtils.isNullToZero(sysBaseSetInfo.getPayPersonal()));
//第一次收取费用逻辑：新员工入职是否收费处理逻辑：先按第一次不收取费用 (只针对按年收)
if (library.getSocialPayMonth().equals(DateUtil.formatDatePatten(socialInfo.getSocialStartDate(), null))
if (library.getSocialPayMonth().equals(DateUtil.formatDatePatten(socialInfo.getBigailmentStart(), null))
&& CommonConstants.ONE_STRING.equals(socialInfo.getIsChargePersonal())) {
library.setUnitBitailmentFee(BigDecimal.ZERO);
library.setPersonalBigailmentFee(BigDecimal.ZERO);
}
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 11e62d9b
......@@ -388,6 +388,139 @@
a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
</sql>
<!-- 其他地方查询，不需要拼接项目名称 -->
<sql id="Other_Base_Column_List">
a.ID,
a.EMP_ID,
a.EMP_NO,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_TYPE,
a.SETTLE_DOMAIN,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.UNIT_NAME,
a.UNIT_ID,
a.SETTLE_DOMAIN_FUND,
a.SETTLE_DOMAIN_CODE_FUND,
a.SETTLE_DOMAIN_NAME_FUND,
a.UNIT_NAME_FUND,
a.UNIT_ID_FUND,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD_NAME,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.PROVIDENT_HOUSEHOLD,
a.PROVIDENT_HOUSEHOLD_NAME,
a.FUND_PROVINCE,
a.FUND_CITY,
a.FUND_TOWN,
a.SOCIAL_ADD_STATUS,
a.FUND_ADD_STATUS,
a.SOCIAL_REDUCE_STATUS,
a.FUND_REDUCE_STATUS,
a.SOCIAL_ID,
a.FUND_ID,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.FIRST_BUY_MONTH_SOCIAL,
a.UNIT_PENSION_CARDINAL,
a.UNIT_MEDICAL_CARDINAL,
a.UNIT_UNEMPLOYMENT_CARDINAL,
a.UNIT_BIGAILMENT_CARDINAL,
a.UNIT_WORK_INJURY_CARDINAL,
a.UNIT_BIRTH_CARDINAL,
a.PERSONAL_PENSION_CARDINAL,
a.PERSONAL_MEDICAL_CARDINAL,
a.PERSONAL_BIGAILMENT_CARDINAL,
a.PERSONAL_UNEMPLOYMENT_CARDINAL,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER,
a.UNIT_WORK_UNJURY_PER,
a.UNIT_BIRTH_PER,
a.PERSONAL_PENSION_PER,
a.PERSONAL_MEDICAL_PER,
a.PERSONAL_UNEMPLOYMENT_PER,
a.HANDLE_STATUS,
a.PERSONAL_BIGAILMENT_PER,
a.UNIT_BIGAILMENT_PER,
a.SOCIAL_REDUCE_DATE,
a.CAN_OVERPAY,
a.PAY_POLICY,
a.OVERPAY_NUMBER,
a.HAVE_THIS_MONTH,
a.INSURANCE_PENSION,
a.INSURANCE_MEDICAL,
a.INSURANCE_UNEMPLOYMENT,
a.INSURANCE_INJURY,
a.INSURANCE_BIRTH,
a.INSURANCE_BIGAILMENT,
a.LATEST_CARDINALITY,
a.IS_ILLNESS,
a.COLLECT_TYPE,
a.VALUE_TYPE,
a.COLLECT_MOTH,
a.IS_CHARGE_PERSONAL,
a.RECORD_BASE,
a.TRUST_REMARK,
a.PAYMENT_TYPE,
a.UPPER_LIMIT,
a.LOWER_LIMIT,
a.PENSION_START,
a.MEDICAL_START,
a.UNEMPLOY_START,
a.WORK_INJURY_START,
a.BIRTH_START,
a.BIGAILMENT_START,
a.PENSION_HANDLE,
a.MEDICAL_HANDLE,
a.UNEMPLOY_HANDLE,
a.WORK_INJURY_HANDLE,
a.BIRTH_HANDLE,
a.BIGAILMENT_HANDLE,
a.UNIT_PERSION_MONEY,
a.UNIT_MEDICAL_MONEY,
a.UNIT_UNEMPLOYMENT_MONEY,
a.UNIT_INJURY_MONEY,
a.UNIT_BIRTH_MONEY,
a.UNIT_BIGAILMENT_MONEY,
a.PERSONAL_PERSION_MONEY,
a.PERSONAL_MEDICAL_MONEY,
a.PERSONAL_UNEMPLOYMENT_MONEY,
a.PERSONAL_BIGAILMENT_MONEY,
a.UNIT_PROVIDENG_CARDINAL,
a.PERSONAL_PROVIDENT_CARDINAL,
a.SOCIAL_START_DATE,
a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER,
a.PROVIDENT_START,
a.FIRST_BUY_MOTH_FUND,
a.UPPER_LIMIT_FUND,
a.LOWER_LIMIT_FUND,
a.FUND_PAY_POINT,
a.CAN_OVERPAY_FUND,
a.OVERPAY_NUMBER_FUND,
a.PAY_POLICY_FUND,
a.TRUST_REMARK_FUND,
a.HAVE_THIS_MONTH_FUND,
a.LATEST_CARDINALITY_FUND,
a.FUND_REDUCE_DATE,
a.PERSONAL_FUND_SUM,
a.UNIT_FUND_SUM,
a.UNIT_SOCIAL_SUM,
a.PERSONAL_SOCIAL_SUM,
a.UNIT_INTEREST_FEE,
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS,
a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
</sql>
<sql id="tSocialFundInfo_where">
<if test="tSocialFundInfo != null">
<if test="tSocialFundInfo.idList != null">
......@@ -748,7 +881,7 @@
<!--获取在用社保-->
<select id="getSocialList" resultMap="tSocialFundInfoMap">
SELECT
<include refid="Base_Column_List"/>
<include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a
<where>
a.SOCIAL_ADD_STATUS != '4' and a.SOCIAL_REDUCE_STATUS != '2'
......@@ -766,7 +899,7 @@
<!--获取在用公积金-->
<select id="getFundList" resultMap="tSocialFundInfoMap">
SELECT
<include refid="Base_Column_List"/>
<include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a
<where>
a.FUND_ADD_STATUS != '4' and a.FUND_REDUCE_STATUS != '2'
......
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