Administrator 2 years ago
parent
commit
f1f9924600

+ 6 - 0
mhotel/WebRoot/web/WEB-INF/web.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>

+ 9 - 7
mhotel/src/com/happy/Model/Booking.java

@@ -1,6 +1,8 @@
 package com.happy.Model;
 
 
+import com.happy.Until.DateUtil;
+
 import java.util.List;
 
 /**
@@ -287,7 +289,7 @@ public class Booking {
 
 
   public String getOrderStartTime() {
-    return orderStartTime;
+    return DateUtil.convertDateTimeMysql(orderStartTime);
   }
 
   public void setOrderStartTime(String orderStartTime) {
@@ -296,7 +298,7 @@ public class Booking {
 
 
   public String getOrderEndTime() {
-    return orderEndTime;
+    return DateUtil.convertDateTimeMysql(orderEndTime);
   }
 
   public void setOrderEndTime(String orderEndTime) {
@@ -323,7 +325,7 @@ public class Booking {
 
 
   public String getCreateTime() {
-    return createTime;
+    return DateUtil.convertDateTimeMysql(createTime);
   }
 
   public void setCreateTime(String createTime) {
@@ -341,7 +343,7 @@ public class Booking {
 
 
   public String getUpdateTime() {
-    return updateTime;
+    return DateUtil.convertDateTimeMysql(updateTime);
   }
 
   public void setUpdateTime(String updateTime) {
@@ -350,7 +352,7 @@ public class Booking {
 
 
   public String getPayTime() {
-    return payTime;
+    return DateUtil.convertDateTimeMysql(payTime);
   }
 
   public void setPayTime(String payTime) {
@@ -395,7 +397,7 @@ public class Booking {
 
 
   public String getRefundTime() {
-    return refundTime;
+    return DateUtil.convertDateTimeMysql(refundTime);
   }
 
   public void setRefundTime(String refundTime) {
@@ -404,7 +406,7 @@ public class Booking {
 
 
   public String getCheckOutTime() {
-    return checkOutTime;
+    return DateUtil.convertDateTimeMysql(checkOutTime);
   }
 
   public void setCheckOutTime(String checkOutTime) {

+ 22 - 0
mhotel/src/com/happy/Until/DateUtil.java

@@ -49,6 +49,28 @@ public class DateUtil
     }
 
     /**
+     * 数据库使用mysql的datetime类型时读取出来数据后出现“.0”
+     * 此工具类进行类型转化
+     * @param time
+     * @return
+     */
+    public static String convertDateTimeMysql(String time)
+    {
+        if (Func.checkNull(time))
+            return time;
+        try {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date date = format.parse(time);
+            String resultTime= format.format(date);
+            return resultTime;
+        } catch (ParseException e) {
+//            throw new RuntimeException(e);
+            return time.replace(".0","");
+        }
+
+    }
+
+    /**
      * 比较日期
      * @param firstDate 第一个
      * @param secondDate 第二个