Browse Source

原来修改错了,改回来。

xuxuan 5 years ago
parent
commit
c58923507e

+ 1 - 0
core/src/main/java/com/mooctest/crowd/domain/model/CrowdTestProjectPO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**

+ 0 - 2
site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -83,8 +83,6 @@ public class CrowdTaskVO {
                 this.time_interval=times[2]+"分钟前发布";
             }else if(times[3]>0){
                 this.time_interval=times[3]+"秒前发布";
-            } else if(times[3]<0){
-                this.time_interval=times[3]*-1+"秒前发布";
             }
         } catch (ParseException e) {
             e.printStackTrace();

+ 16 - 17
site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTestProjectVO.java

@@ -48,11 +48,11 @@ public class CrowdTestProjectVO {
     private int isDeleted;
     private int joinCount;
     private Timestamp createTime;
-    private  String  time_interval;
+    private String time_interval;
 
-    public  CrowdTestProjectVO(CrowdTestProject crowdTestProject) {
-        id=crowdTestProject.getId();
-        code=crowdTestProject.getCode();
+    public CrowdTestProjectVO(CrowdTestProject crowdTestProject) {
+        id = crowdTestProject.getId();
+        code = crowdTestProject.getCode();
         name = crowdTestProject.getName();
         userId = crowdTestProject.getUserId();
         regionalManagerId = crowdTestProject.getRegionalManagerId();
@@ -78,25 +78,24 @@ public class CrowdTestProjectVO {
         createTime = crowdTestProject.getCreateTime();
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
-            Date date = df.parse(df.format(crowdTestProject.getCreateTime()));
+            Date date = crowdTestProject.getCreateTime();
             long[] times = getDistanceTimes(date);
-            if(times[0]>0){
-                this.time_interval=times[0]+"天前发布";
-            }else if(times[1]>0){
-                this.time_interval=times[1]+"小时前发布";
-            }else if(times[2]>0){
-                this.time_interval=times[2]+"分钟前发布";
-            }else if(times[3]>0){
-                this.time_interval=times[3]+"秒前发布";
-            }else if(times[3]<0){
-                this.time_interval=times[3]*-1+"秒前发布";
+            if (times[0] > 0) {
+                this.time_interval = times[0] + "天前发布";
+            } else if (times[1] > 0) {
+                this.time_interval = times[1] + "小时前发布";
+            } else if (times[2] > 0) {
+                this.time_interval = times[2] + "分钟前发布";
+            } else if (times[3] > 0) {
+                this.time_interval = times[3] + "秒前发布";
             }
-        } catch (ParseException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
 
     }
+
     public static long[] getDistanceTimes(Date date) {
         long day = 0;
         long hour = 0;
@@ -107,7 +106,7 @@ public class CrowdTestProjectVO {
         day = diff / (24 * 60 * 60 * 1000);
         hour = (diff / (60 * 60 * 1000) - day * 24);
         min = ((diff / (60 * 1000)) - day * 24 * 60 - hour * 60);
-        sec = (diff/1000-day*24*60*60-hour*60*60-min*60);
+        sec = (diff / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
         long[] times = {day, hour, min, sec};
         return times;
     }