Skip to content

Y
yifu-mvp
Commit 81bf81d2 authored by hongguangwu's avatar hongguangwu
Browse files
Options

户调基-修改社保公积金查询

parent f848382a
Hide whitespace changes
Inline Side-by-side
Showing with 23 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 @ 81bf81d2
...@@ -1677,21 +1677,31 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1677,21 +1677,31 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @return: java.util.Date * @return: java.util.Date
**/ **/
private Date getMinDate(TSocialFundInfo socialFundInfo) { private Date getMinDate(TSocialFundInfo socialFundInfo) {
Date minStartDate = socialFundInfo.getSocialStartDate(); Date minStartDate = null;
if (socialFundInfo.getUnitPersionMoney() != null && socialFundInfo.getPensionStart() != null && socialFundInfo.getPensionStart().before(minStartDate)) { if (socialFundInfo.getSocialStartDate() != null) {
minStartDate = socialFundInfo.getPensionStart(); minStartDate = socialFundInfo.getSocialStartDate();
} if (socialFundInfo.getUnitPersionMoney() != null && socialFundInfo.getPensionStart() != null && socialFundInfo.getPensionStart().before(minStartDate)) {
if (socialFundInfo.getUnitMedicalMoney() != null && socialFundInfo.getMedicalStart() != null && socialFundInfo.getMedicalStart().before(minStartDate)) { minStartDate = socialFundInfo.getPensionStart();
minStartDate = socialFundInfo.getMedicalStart(); }
} if (socialFundInfo.getUnitMedicalMoney() != null && socialFundInfo.getMedicalStart() != null && socialFundInfo.getMedicalStart().before(minStartDate)) {
if (socialFundInfo.getUnitUnemploymentMoney() != null && socialFundInfo.getUnemployStart() != null && socialFundInfo.getUnemployStart().before(minStartDate)) { minStartDate = socialFundInfo.getMedicalStart();
minStartDate = socialFundInfo.getUnemployStart(); }
if (socialFundInfo.getUnitUnemploymentMoney() != null && socialFundInfo.getUnemployStart() != null && socialFundInfo.getUnemployStart().before(minStartDate)) {
minStartDate = socialFundInfo.getUnemployStart();
}
if (socialFundInfo.getUnitInjuryMoney() != null && socialFundInfo.getWorkInjuryStart() != null && socialFundInfo.getWorkInjuryStart().before(minStartDate)) {
minStartDate = socialFundInfo.getWorkInjuryStart();
}
if (socialFundInfo.getUnitBirthMoney() != null && socialFundInfo.getBirthStart() != null && socialFundInfo.getBirthStart().before(minStartDate)) {
minStartDate = socialFundInfo.getBirthStart();
}
} }
if (socialFundInfo.getUnitInjuryMoney() != null && socialFundInfo.getWorkInjuryStart() != null && socialFundInfo.getWorkInjuryStart().before(minStartDate)) { if (socialFundInfo.getProvidentStart() != null
minStartDate = socialFundInfo.getWorkInjuryStart(); && (null == minStartDate || socialFundInfo.getProvidentStart().before(minStartDate))) {
minStartDate = socialFundInfo.getProvidentStart();
} }
if (socialFundInfo.getUnitBirthMoney() != null && socialFundInfo.getBirthStart() != null && socialFundInfo.getBirthStart().before(minStartDate)) { if (null == minStartDate) {
minStartDate = socialFundInfo.getBirthStart(); minStartDate = new Date();
} }
return minStartDate; return minStartDate;
} }
......
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