预派单调整

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java

@@ -1600,23 +1600,27 @@ public class DateUtil {
           }
      }
 
-	public static boolean isDate(String dateText,String format) {
+	public static boolean isDate(String dateText) {
 		if (dateText == null) {
 			return true;
 		}
 		DateFormat df = null;
 		try {
-
-			if (format != null) {
-				df = new SimpleDateFormat(format);
-			} else {
+			if (dateText.indexOf("-") >= 0) {
+				df = new SimpleDateFormat(ISO_EXPANDED_DATE_FORMAT);
+				df.setLenient(false);
+				df.parse(dateText);
+			}else if (dateText.indexOf("/") >= 0) {
+				df = new SimpleDateFormat(DateUtil.DATETIME_PATTERN_XIEGANG);
+				df.setLenient(false);
+				df.parse(dateText);
+			}else{
 				df = new SimpleDateFormat(ISO_DATE_FORMAT);
+				df.setLenient(false);
+				df.parse( dateText.replace("/","").replace("-","")
+						.replace(CommonConstants.YEAR,"").replace(CommonConstants.MONTH,"")
+						.replace(CommonConstants.DAY,""));
 			}
-
-			df.setLenient(false);
-			df.parse( dateText.replace("/","").replace("-","")
-					.replace(CommonConstants.YEAR,"").replace(CommonConstants.MONTH,"")
-					.replace(CommonConstants.DAY,""));
 		} catch (ParseException e) {
 			return true;
 		}

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

@@ -759,8 +759,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			if (checkAddRepeat(errorList, existsMap, i, info)) {
 				continue;
 			}
-			if (Common.isNotNull(info.getLeaveDate())
-					&& DateUtil.isDate(info.getLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT)){
+			if (Common.isNotNull(info.getLeaveDate()) && DateUtil.isDate(info.getLeaveDate())){
 				errorList.add(new ErrorMessage(i, PreDispatchConstants.LEAVE_DATE_FORMAT_ERROR));
 				continue;
 			}