diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 32dd202fb..ecfdbf177 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -268,6 +268,9 @@ public class OrderController { // 获取数据 list = (List) map.get("plate"); Map mapOrder = excelReadUtil.changeOrderDO((Map) map.get("order")); + if (list.size() == 0) { + orderDO.setStatus(0); + } orderDO = ((OrderDO) mapOrder.get("order")).setOrderType(0).setStatus(1); String err = ((String) mapOrder.get("error")); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java index 42ac82fa6..78bdc1244 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelReadUtil.java @@ -83,10 +83,10 @@ public class ExcelReadUtil { // 文件读取 // string 拼接 String error = ""; // 电话校验 - if (validatePhoneNumber((String) orderMap.get("客户电话"))) { + if (!validatePhoneNumber((String) orderMap.get("客户电话"))) { error += (String) orderMap.get("客户电话")+ "-客户电话格式错误;"; } - if (validatePhoneNumber((String) orderMap.get("经销商电话"))) { + if (!validatePhoneNumber((String) orderMap.get("经销商电话"))) { error += (String) orderMap.get("经销商电话")+ "-经销商电话格式错误;"; } OrderDO orderDO = OrderDO.builder() @@ -130,23 +130,6 @@ public class ExcelReadUtil { // 文件读取 return true; } - // 日期合法性校验 - private Boolean validateDate(String dateString) { - // 定义日期正则表达式 - String regex = "^\\d{4}/\\d{2}/\\d{2}$"; - - // 编译正则表达式 - Pattern pattern = Pattern.compile(regex); - - // 创建 Matcher 对象 - Matcher matcher = pattern.matcher(dateString); - - // 判断日期是否匹配正则表达式 - if (!matcher.matches()) { - return false; - } - return true; - } private LocalDateTime changeTime(String dateString) { // 使用 DateTimeFormatter 解析字符串为 LocalDateTime 对象