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

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -448,4 +448,12 @@ public interface ErrorCodes {
 	 * 派增异常： 社保各项起缴日不一致，委托备注必填
 	 */
 	String EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR = "emp.dispatch.social.date.limit.error";
+	/**
+	 * 派增异常： 社保各项起缴月份需为可补缴月份，请确认后操作！
+	 */
+	String EMP_DISPATCH_SOCIAL_START_IS_ERROR = "emp.dispatch.social.start.is.error";
+	/**
+	 * 派增异常： 公积金起缴月份需为可补缴月份，请确认后操作！
+	 */
+	String EMP_DISPATCH_FUND_DATE_LIMIT_ERROR = "emp.dispatch.fund.start.is.error";
 }

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -167,6 +167,10 @@ emp.dispatch.social.base.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD
 
 emp.dispatch.social.date.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u65E5\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
 
+emp.dispatch.social.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
+
+emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
+
 
 
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -54,7 +54,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 身份证号
 	 */
 	@Length(max = 20, message = "身份证号 不能超过20 个字符" )
-	@ExcelAttribute(name = "身份证号", maxLength = 20, isNotEmpty = true)
+	@ExcelAttribute(name = "身份证号", maxLength = 20)
 	@Schema(description = "身份证号" )
 	@ExcelProperty("身份证号" )
 	private String empIdcard;
@@ -62,7 +62,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 员工类型
 	 */
 	@Length(max = 32, message = "员工类型 不能超过32 个字符" )
-	@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE, isNotEmpty = true)
+	@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@Schema(description = "员工类型" )
 	@ExcelProperty("员工类型" )
 	private String empType;
@@ -70,7 +70,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 手机号码
 	 */
 	@Length(max = 32, message = "手机号码 不能超过32 个字符" )
-	@ExcelAttribute(name = "手机号码", maxLength = 32, isNotEmpty = true)
+	@ExcelAttribute(name = "手机号码", maxLength = 32)
 	@Schema(description = "手机号码" )
 	@ExcelProperty("手机号码" )
 	private String empMobile;
@@ -123,7 +123,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 档案-市
 	 */
-	@ExcelAttribute(name = "档案-市" ,isArea = true,parentField = "fileProvince", isNotEmpty = true)
+	@ExcelAttribute(name = "档案-市" ,isArea = true,parentField = "fileProvince")
 	@Schema(description = "档案-市" )
 	@ExcelProperty("档案-市" )
 	private String fileCity;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java

@@ -155,4 +155,31 @@ public class ServiceUtil {
 		}
 		return false;
 	}
+
+	/**
+	 * 查看社保公积金起缴日期是否符合补缴逻辑
+	 * @Author fxj
+	 * @Date 2020-09-07
+	 * @param socialStartDate  起缴日期
+	 * @param canOverpay  是否可补缴 0：是，1：否
+	 * @param overpayNumber  补缴期限 整数
+	 * @param haveThisMonth 是否含当月 0：是，1：否   如果无符合条件默认不含当月
+	 * @return 符合 false  不符合 true
+	 **/
+	public  static boolean checkDispatchDate(LocalDateTime socialStartDate,String canOverpay,Integer overpayNumber,String haveThisMonth){
+		if (null == socialStartDate){
+			return false;
+		}
+		LocalDateTime temp = null;
+		LocalDateTime now = LocalDateTime.now();
+		if (CommonConstants.ZERO_STRING.equals(canOverpay)){
+			temp = socialStartDate.plusMonths(CommonConstants.ZERO_STRING.equals(haveThisMonth)?(long)overpayNumber:(long)(overpayNumber+1));
+		}else if (CommonConstants.ONE_STRING.equals(canOverpay)){
+			temp = socialStartDate;
+		}
+		return (null != temp && (temp.getYear() < now.getYear() || isaBoolean(temp, now)));
+	}
+	private static boolean isaBoolean(LocalDateTime temp, LocalDateTime now) {
+		return temp.getYear() == now.getYear() && temp.getMonthValue() < now.getMonthValue();
+	}
 }