Merge branch 'xjw' of http://git.mooctest.net/summer/crowdsource-backend into xjw

src/main/java/edu/nju/dao/ReviewAnswerDao.java

@@ -40,7 +40,7 @@ public class ReviewAnswerDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewAnswer> list = mongoOperations.find(query, ReviewAnswer.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewCorrectAnswerDao.java

@@ -35,7 +35,7 @@ public class ReviewCorrectAnswerDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewCorrectAnswer> list = mongoOperations.find(query, ReviewCorrectAnswer.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 }

src/main/java/edu/nju/dao/ReviewGroupDao.java

@@ -26,7 +26,7 @@ public class ReviewGroupDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("workers_id").is(worker_id).and("job_id").is(job_id));
         List<ReviewGroup>list = mongoOperations.find(query, ReviewGroup.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0).getReport_id();
     }
 
@@ -40,7 +40,7 @@ public class ReviewGroupDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("report_id").is(reportIds));
         List<ReviewGroup>list = mongoOperations.find(query, ReviewGroup.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewJobDao.java

@@ -21,7 +21,7 @@ public class ReviewJobDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewJob> list = mongoOperations.find(query,ReviewJob.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0  ) {return null;}
         return list.get(0);
     }
 
@@ -29,7 +29,7 @@ public class ReviewJobDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("exam_id").is(examId).and("case_id").is(caseId));
         List<ReviewJob> list = mongoOperations.find(query,ReviewJob.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewPaperDao.java

@@ -21,7 +21,7 @@ public class ReviewPaperDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewPaper> list = mongoOperations.find(query,ReviewPaper.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0 ) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewPaperJsonDao.java

@@ -20,7 +20,7 @@ public class ReviewPaperJsonDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("paper_id").is(paperId));
         List<ReviewPaperJson> list = mongoOperations.find(query,ReviewPaperJson.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0 ) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewReportDao.java

@@ -20,7 +20,7 @@ public class ReviewReportDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewReport> list = mongoOperations.find(query,ReviewReport.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 
@@ -28,7 +28,7 @@ public class ReviewReportDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("paper_id").is(paperId).and("original_id").is(originalId));
         List<ReviewReport> list = mongoOperations.find(query,ReviewReport.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/dao/ReviewWorkerDao.java

@@ -27,7 +27,7 @@ public class ReviewWorkerDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("original_id").is(originalId).and("job_id").is(jobId));
         List<ReviewWorker> list = mongoOperations.find(query,ReviewWorker.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 
@@ -48,7 +48,7 @@ public class ReviewWorkerDao {
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(id));
         List<ReviewWorker> list = mongoOperations.find(query,ReviewWorker.class);
-        if(list.size() == 0 || list == null) {return null;}
+        if(list == null||list.size() == 0) {return null;}
         return list.get(0);
     }
 

src/main/java/edu/nju/service/ExtraService.java

@@ -11,16 +11,12 @@ import edu.nju.dao.*;
 import edu.nju.entities.*;
 import edu.nju.model.BugRecurrent;
 import edu.nju.model.BugSeverity;
-import edu.nju.util.FormatJson;
-import edu.nju.util.HTTP;
-import edu.nju.util.OssAliyun;
+import edu.nju.util.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.nju.util.ExcelToJson;
-
 @Service
 public class ExtraService {
 
@@ -215,7 +211,7 @@ public class ExtraService {
 				BugRecurrent bugRecurrent=BugRecurrent.getValue(bug.getRecurrent());
 				description+=bugRecurrent+"\n";
 				SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-				String dateStr = dateformat.format(bug.getCreate_time_millis());
+				String dateStr = dateformat.format(TimeUtil.StringToDate(bug.getCreate_time_millis()));
 				description+=dateStr+"\n";
 				if(mirror==null){
 					description+="0\n";

src/main/java/edu/nju/util/TimeUtil.java

@@ -0,0 +1,19 @@
+package edu.nju.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TimeUtil {
+    public static Date StringToDate(String datetime){
+        SimpleDateFormat sdFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        try {
+            date = sdFormat.parse(datetime);
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return date;
+    }
+}