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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

@@ -1677,7 +1677,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @return: java.util.Date
 	 **/
 	private Date getMinDate(TSocialFundInfo socialFundInfo) {
-		Date minStartDate = socialFundInfo.getSocialStartDate();
+		Date minStartDate = null;
+		if (socialFundInfo.getSocialStartDate() != null) {
+			minStartDate = socialFundInfo.getSocialStartDate();
 			if (socialFundInfo.getUnitPersionMoney() != null && socialFundInfo.getPensionStart() != null && socialFundInfo.getPensionStart().before(minStartDate)) {
 				minStartDate = socialFundInfo.getPensionStart();
 			}
@@ -1693,6 +1695,14 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (socialFundInfo.getUnitBirthMoney() != null && socialFundInfo.getBirthStart() != null && socialFundInfo.getBirthStart().before(minStartDate)) {
 				minStartDate = socialFundInfo.getBirthStart();
 			}
+		}
+		if (socialFundInfo.getProvidentStart() != null
+				&& (null == minStartDate || socialFundInfo.getProvidentStart().before(minStartDate))) {
+				minStartDate = socialFundInfo.getProvidentStart();
+		}
+		if (null == minStartDate) {
+			minStartDate = new Date();
+		}
 		return minStartDate;
 	}