为时间格式调整

web/src/main/java/com/jpsoft/order/modules/base/controller/OrderFormController.java

@@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -361,7 +362,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strRequiredDeliveryTime)) {
                             try {
-                                orderForm.setRequiredDeliveryTime(getDate(Integer.parseInt(strRequiredDeliveryTime)));
+                                orderForm.setRequiredDeliveryTime(getDate(strRequiredDeliveryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("要求交期数据错误!");
                                 failCount++;
@@ -375,7 +376,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strReviewDeliveryTime)) {
                             try {
-                                orderForm.setReviewDeliveryTime(getDate(Integer.parseInt(strReviewDeliveryTime)));
+                                orderForm.setReviewDeliveryTime(getDate(strReviewDeliveryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("评审交期数据错误!");
                                 failCount++;
@@ -417,7 +418,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strExpiryTime)) {
                             try {
-                                orderForm.setExpiryTime(getDate(Integer.parseInt(strExpiryTime)));
+                                orderForm.setExpiryTime(getDate(strExpiryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("过期时间数据错误!");
                                 failCount++;
@@ -519,7 +520,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strRequiredDeliveryTime)) {
                             try {
-                                orderForm.setRequiredDeliveryTime(getDate(Integer.parseInt(strRequiredDeliveryTime)));
+                                orderForm.setRequiredDeliveryTime(getDate(strRequiredDeliveryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("要求交期数据错误!");
                                 failCount++;
@@ -533,7 +534,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strReviewDeliveryTime)) {
                             try {
-                                orderForm.setReviewDeliveryTime(getDate(Integer.parseInt(strReviewDeliveryTime)));
+                                orderForm.setReviewDeliveryTime(getDate(strReviewDeliveryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("评审交期数据错误!");
                                 failCount++;
@@ -575,7 +576,7 @@ public class OrderFormController {
 
                         if (StringUtils.isNotEmpty(strExpiryTime)) {
                             try {
-                                orderForm.setExpiryTime(getDate(Integer.parseInt(strExpiryTime)));
+                                orderForm.setExpiryTime(getDate(strExpiryTime));
                             } catch (Exception ex) {
                                 sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("过期时间数据错误!");
                                 failCount++;
@@ -636,9 +637,16 @@ public class OrderFormController {
         return msgResult;
     }
 
-    private Date getDate(int days){
-        Calendar calendar = new GregorianCalendar(1900,0,-1);
-        calendar.add(calendar.DATE, days);
+    private Date getDate(String days) throws ParseException {
+        Calendar calendar = new GregorianCalendar(1900, 0, -1);
+
+        try {
+            calendar.add(calendar.DATE, Integer.parseInt(days));
+        }
+        catch (Exception ex) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            calendar.setTime(sdf.parse(days));
+        }
 
         return calendar.getTime();
     }