Skip to content

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

薪资人员列表 查询 详情 导出

parent 79a5aa2a
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 83 deletions
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ eb13e8f5
......@@ -722,9 +722,16 @@
t_employee_contract_info x
WHERE
x.DELETE_FLAG = '0'
AND x.AUDIT_STATUS != '3'
AND x.IS_OBSOLETE = '0'
AND (
(
x.AUDIT_STATUS = '2'
AND x.IN_USE = '0'
)
OR (
x.AUDIT_STATUS = '1'
AND x.IN_USE = '1'
)
)
<if test="checkVo != null">
<if test="checkVo.idCards != null">
AND x.EMP_IDCARD in
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ eb13e8f5
......@@ -630,11 +630,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(socialFund.getFirstBuyMonthSocial())){
socialFund.setFirstBuyMonthSocial(social.getSocialStartDate());
}
socialFund.setUnitPersionMoney(BigDecimal.ZERO);
socialFund.setUnitMedicalMoney(BigDecimal.ZERO);
socialFund.setUnitUnemploymentMoney(BigDecimal.ZERO);
socialFund.setUnitInjuryMoney(BigDecimal.ZERO);
socialFund.setUnitBirthMoney(BigDecimal.ZERO);
if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())){
socialFund.setUnitBigailmentMoney(social.getUnitBigailmentMoney());
......@@ -668,7 +663,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setUnemployHandle(social.getUnemployHandle());
}
if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())){
&& CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
socialFund.setUnitBigailmentCardinal(social.getUnitBigailmentCardinal());
socialFund.setPersonalBigailmentCardinal(social.getPersonalBigailmentCardinal());
socialFund.setUnitBigailmentPer(social.getUnitBigailmentPer());
......@@ -702,6 +697,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setLatestCardinality(social.getInsuranceIsLatestCardinality());
socialFund.setIsIllness(social.getIsIllness());
socialFund.setCollectType(social.getCollectType());
socialFund.setCollectMoth(social.getCollectMoth());
socialFund.setValueType(social.getValueType());
socialFund.setIsChargePersonal(social.getIsChargePersonal());
socialFund.setRecordBase(social.getRecordBase());
......@@ -974,32 +970,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet) {
StringBuffer temp = new StringBuffer();
if (Common.isEmpty(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){
if (Common.isNotNull(excel.getPensionStart())){
temp.append(DispatchConstants.DISPATCH_PENSION);
}
if (Common.isNotNull(excel.getMedicalStart())){
temp.append(DispatchConstants.DISPATCH_MEDICAL);
}
if (Common.isNotNull(excel.getBirthStart())){
temp.append(DispatchConstants.DISPATCH_BIRTH);
}
if (Common.isNotNull(excel.getWorkInjuryStart())){
temp.append(DispatchConstants.DISPATCH_INJURY);
}
if (Common.isNotNull(excel.getUnemployStart())){
temp.append(DispatchConstants.DISPATCH_UNEMP);
}
if (Common.isNotNull(excel.getBigailmentStart())
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())){
temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
}
}
if (Common.isNotNull(excel.getProvidentHousehold())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
}
if (Common.isNotNull(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){
// 办理失败或已派减 视为可派增
......@@ -1030,11 +1000,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
//公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
if (Common.isNotNull(excel.getProvidentHousehold())
&& (CommonConstants.FOUR_STRING.equals(socialFund.getFundStatus())
|| CommonConstants.NINE_STRING.equals(socialFund.getFundStatus())
|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
)){
if (Common.isNotNull(excel.getProvidentHousehold())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
}
......@@ -1236,25 +1202,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitUnemploymentPer(socialSet.getUnitUnemploymentPro());
social.setUnitWorkUnjuryPer(socialSet.getUnitInjuryPro());
social.setUnitBirthPer(socialSet.getUnitBirthPro());
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(excel.getBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentCardinal(ServiceUtil.ifNull(excel.getBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
social.setBigailmentHandle(CommonConstants.ZERO_STRING);
social.setBigailmentStart(excel.getBigailmentStart());
social.setCollectMoth(socialSet.getCollectMoth());
}else {
social.setInsuranceBigailment(null);
social.setPersonalBigailmentCardinal(null);
social.setUnitBigailmentCardinal(null);
social.setUnitBigailmentPer(null);
social.setPersonalBigailmentPer(null);
social.setBigailmentHandle(null);
social.setBigailmentStart(null);
social.setCollectMoth(null);
}
//按最低
if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
social.setPersonalPensionCardinal(socialSet.getLowerLimit());
......@@ -1287,6 +1234,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitBigailmentCardinal(socialSet.getUpperLimit());
}
}
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(social.getPersonalBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentCardinal(ServiceUtil.ifNull(social.getUnitBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
social.setBigailmentHandle(CommonConstants.ZERO_STRING);
social.setBigailmentStart(excel.getBigailmentStart());
social.setCollectMoth(socialSet.getCollectMoth());
}else {
social.setInsuranceBigailment(null);
social.setPersonalBigailmentCardinal(null);
social.setUnitBigailmentCardinal(null);
social.setUnitBigailmentPer(null);
social.setPersonalBigailmentPer(null);
social.setBigailmentHandle(null);
social.setBigailmentStart(null);
social.setCollectMoth(null);
}
}
social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
......@@ -1671,7 +1637,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& Common.isEmpty(excel.getUnemployStart())
&& Common.isEmpty(excel.getBigailmentStart())
&& Common.isNotNull(excel.getWorkInjuryStart())
&& Common.isEmpty(BigDecimal.ZERO.compareTo(excel.getWorkInjuryCardinal()) > 0);
&& (BigDecimal.ZERO.compareTo(excel.getWorkInjuryCardinal()) <= 0);
if (flag) {
// 有兼职工伤不可重复增 (未派减成功不可新增兼职工伤)
if (CommonConstants.ZERO_STRING.equals(sf.getWorkInjuryHandle())
......@@ -1680,15 +1646,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return true;
}
// 有五险未派减不给新增兼职工伤
flag = CommonConstants.ZERO_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getMedicalHandle())
flag = CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()));
if (flag) {
......@@ -2682,6 +2643,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dis.setAuditUser(user.getId());
dis.setAuditTime(now);
baseMapper.updateById(dis);
// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
boolean flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
socialFundMapper.updateById(sf);
// 派增审核不通过
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
......@@ -2698,15 +2673,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
vo.setEmpIdCard(dis.getEmpIdcard());
vo.setDepartNo(dis.getSettleDomainCode());
if (Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
){
if (flagTemp){
vo.setSocialStatus(CommonConstants.TWO_STRING);
}
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
......@@ -3080,6 +3047,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo.setEmpIdcard(dis.getEmpIdcard());
auditInfoMapper.insert(auditInfo);
baseMapper.updateById(dis);
// 派增办理失败 失败项重新派单办理失败 恢复为部分办理失败
boolean flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
socialFundMapper.updateById(sf);
//1.派增办理失败 刷新预估数据
if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
......@@ -3142,7 +3122,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.THREE_STRING.equals(socialInfo.getHandleStatus())){
vo.setSocialStatus(CommonConstants.FOUR_STRING);
}
if ((CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
boolean flag = (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
......@@ -3151,13 +3131,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
&&
(!CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (!CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
){
|| !CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (!CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flag){
vo.setSocialStatus(CommonConstants.TWO_STRING);
}
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ eb13e8f5
......@@ -1853,7 +1853,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
continue;
}
//起缴月份在要生成的月份后不处理 || 截止月份在要生成的月份后不处理
if (Integer.parseInt(payMonth) < DateUtil.formatDateInt(providentFund.getProvidentStart())
if (Common.isNotNull(providentFund.getProvidentStart())
&& Integer.parseInt(payMonth) < DateUtil.formatDateInt(providentFund.getProvidentStart())
|| (Common.isNotNull(providentFund.getFundReduceDate())
&& Integer.parseInt(payMonth) > DateUtil.formatDateInt(providentFund.getFundReduceDate()))) {
continue;
......
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