预派单 参数校验修改

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

@@ -38,16 +38,6 @@ import java.util.Date;
 @Data
 public class TPaymentInfoVo extends RowIndex implements Serializable {
 
-	/**
-	 * 主键
-	 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@NotBlank(message = "主键 不能为空")
-	@Length(max = 32, message = "主键 不能超过32 个字符")
-	@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空", maxLength = 32)
-	@Schema(description = "主键")
-	@ExcelProperty("主键")
-	private String id;
 	/**
 	 * 员工姓名
 	 */
@@ -69,7 +59,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	 */
 	@NotBlank(message = "员工ID 不能为空")
 	@Length(max = 32, message = "员工ID 不能超过32 个字符")
-	@ExcelAttribute(name = "员工ID", isNotEmpty = true, errorInfo = "员工ID 不能为空", maxLength = 32)
+	@ExcelAttribute(name = "员工ID", maxLength = 32)
 	@Schema(description = "员工ID")
 	@ExcelProperty("员工ID")
 	private String empId;

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

@@ -87,12 +87,12 @@ public class ServiceUtil {
 	public static boolean checkMothForPaymentImport(Date socialStartDate, String socialPayMonth, Date reduceDate) {
 		if(socialStartDate != null) {
 			if (null == reduceDate){
-				if(Integer.parseInt(socialPayMonth) >= Integer.parseInt(DateUtil.dateToString(socialStartDate))){
+				if(Integer.parseInt(socialPayMonth) >= Integer.parseInt(DateUtil.dateToString(socialStartDate).replace("-",""))){
 					return true;
 				}
 			}else {
 				if(Integer.parseInt(socialPayMonth) >= Integer.parseInt(DateUtil.dateToString(socialStartDate))
-						&& Integer.parseInt(socialPayMonth) < Integer.parseInt(DateUtil.dateToString(reduceDate))){
+						&& Integer.parseInt(socialPayMonth) < Integer.parseInt(DateUtil.dateToString(reduceDate).replace("-",""))){
 					return true;
 				}
 			}

yifu-social/yifu-social-biz/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+   com.yifu.cloud.plus.v1.yifu.social.concurrent.threadpool.YFThreadPoolConfig