Merge branch 'master_0929' into master_after20

@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -78,6 +79,18 @@ public class ContractFrameworkImportListener extends ExcelImportListener<Contrac
         if (null == data.getValidityTime()) {
             throw new DefaultClientException(
                     "第" + context.readRowHolder().getRowIndex() + "行授时截止日期不可为空");
+        } else {
+            String dateStr = data.getValidityTime().trim();
+            try {
+                LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            } catch (DateTimeParseException e) {
+                try {
+                    LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+                } catch (DateTimeParseException ex) {
+                    throw new DefaultClientException(
+                            "第" + context.readRowHolder().getRowIndex() + "行授时截止日期格式错误！");
+                }
+            }
         }
 
         if (StringUtils.isBlank(data.getMaterialTypeName())) {
@@ -129,7 +142,19 @@ public class ContractFrameworkImportListener extends ExcelImportListener<Contrac
             ContractFrameworkImportModel data = datas.get(i);
             CreateContractFrameworkVo createContractFrameworkVo = new CreateContractFrameworkVo();
             createContractFrameworkVo.setCode(yearTwoDigit + data.getCompany() + deptCode + code);
-            createContractFrameworkVo.setValidityTime(DateUtil.toLocalDate(data.getValidityTime()));
+            String dateStr = data.getValidityTime().trim();
+            try {
+                LocalDate date = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                createContractFrameworkVo.setValidityTime(date);
+            } catch (DateTimeParseException e) {
+                try {
+                    LocalDate date = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+                    createContractFrameworkVo.setValidityTime(date);
+                } catch (DateTimeParseException ex) {
+                    throw new DefaultClientException(
+                            "第" + context.readRowHolder().getRowIndex() + "行授时截止日期格式错误！");
+                }
+            }
             createContractFrameworkVo.setHasFrameworkAgreement(data.getHasFrameworkAgreement());
             createContractFrameworkVo.setCompany(data.getCompany());
             createContractFrameworkVo.setCustomerId(data.getCustomerId());

@@ -63,8 +63,7 @@ public class ContractFrameworkImportModel implements ExcelModel {
      * 授时截止日期
      */
     @ExcelRequired
-    @DateTimeFormat(StringPool.DATE_PATTERN)
     @ExcelProperty("授时截止日期")
-    private Date validityTime;
+    private String validityTime;
 
 }