reviewJob加上工作时间等两个参数

src/main/java/edu/nju/controller/ReviewJobController.java

@@ -55,10 +55,10 @@ public class ReviewJobController {
 
     @RequestMapping(value = "/uploadJob", method = RequestMethod.POST)
     @ResponseBody
-    public void uploadJob(String name, String description, String paperId, String startTime, String endTime, @RequestParam("workerList")List<String>workerList, String workerDistribution,int maxWorker, HttpServletResponse response){
+    public void uploadJob(String name, String description, String paperId, String startTime, String endTime,int singleTime, int totalWorkload, @RequestParam("workerList")List<String>workerList, String workerDistribution,int maxWorker, HttpServletResponse response){
         try {
             PrintWriter out = response.getWriter();
-            JSONObject jsonObject = reviewJobService.uploadJob("","","",name, description, paperId, startTime, endTime, workerList, workerDistribution,maxWorker);
+            JSONObject jsonObject = reviewJobService.uploadJob("","","",name, description, paperId, startTime, endTime,singleTime,totalWorkload, workerList, workerDistribution,maxWorker);
             out.print(jsonObject);
             out.flush();
             out.close();
@@ -92,8 +92,8 @@ public class ReviewJobController {
 
     @RequestMapping(value = "/updateJob", method = RequestMethod.POST)
     @ResponseBody
-    public void updateJob(String jobId, String name, String description, String paperId,String startTime, String endTime,@RequestParam("workerList")List<String>workerList,String workerDistribution, int maxWorker,HttpServletResponse response){
-        JSONObject result = reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, workerList, workerDistribution,maxWorker);
+    public void updateJob(String jobId, String name, String description, String paperId,String startTime, String endTime,int singleTime, int totalWorkload,@RequestParam("workerList")List<String>workerList,String workerDistribution, int maxWorker,HttpServletResponse response){
+        JSONObject result = reviewJobService.updateJob(jobId, name, description, paperId, startTime, endTime, singleTime,totalWorkload,workerList, workerDistribution,maxWorker);
         try {
             PrintWriter out = response.getWriter();
             out.print(result);

src/main/java/edu/nju/entities/ReviewJob.java

@@ -26,12 +26,16 @@ public class ReviewJob implements java.io.Serializable{
 
     private String end_time;
 
+    private int single_time;
+
+    private int total_workload;
+
     private String group;
 
     private int max_worker;
 
     @PersistenceConstructor
-    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id, String start_time, String end_time, String group,Integer max_worker) {
+    public ReviewJob(String exam_id,String case_id, String name, String description, String create_time, String paper_id, String start_time, String end_time, Integer single_time,Integer total_workload,String group,Integer max_worker) {
         this.exam_id=exam_id;
         this.case_id=case_id;
         this.description = description;
@@ -40,6 +44,18 @@ public class ReviewJob implements java.io.Serializable{
         this.create_time = create_time;
         this.start_time = start_time;
         this.end_time = end_time;
+        if(single_time==null){
+            this.single_time=0;
+        }
+        else{
+            this.single_time=single_time;
+        }
+        if(total_workload==null){
+            this.total_workload=0;
+        }
+        else{
+            this.total_workload=total_workload;
+        }
         this.group = group;
         if(max_worker==null){
             this.max_worker=0;
@@ -56,6 +72,8 @@ public class ReviewJob implements java.io.Serializable{
         this.paper_id = paper_id;
         this.create_time = create_time;
         this.start_time = "";
+        this.single_time=0;
+        this.total_workload=0;
         this.end_time = "";
         this.group = "";
 
@@ -93,6 +111,22 @@ public class ReviewJob implements java.io.Serializable{
         this.name = name;
     }
 
+    public int getSingle_time() {
+        return single_time;
+    }
+
+    public void setSingle_time(int single_time) {
+        this.single_time = single_time;
+    }
+
+    public int getTotal_workload() {
+        return total_workload;
+    }
+
+    public void setTotal_workload(int total_workload) {
+        this.total_workload = total_workload;
+    }
+
     public String getPaper_id() {
         return paper_id;
     }

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

@@ -42,17 +42,16 @@ public class ReviewJobService {
         return jobDao.findJobs();
     }
 
-    public JSONObject uploadJob(String jobId,String examId,String caseId,String name, String description, String paperId, String startTime, String endTime, List<String>workerList, String workerDistribution,int maxWorker){
+    public JSONObject uploadJob(String jobId,String examId,String caseId,String name, String description, String paperId, String startTime, String endTime,int singleTime,int totalWorkload, List<String>workerList, String workerDistribution,int maxWorker){
         JSONObject jsonObject=new JSONObject();
         String checkResult=checkJobDistribution(workerDistribution);
-        ReviewPaper reviewPaper=reviewPaperService.getPaper(paperId);
         if(!checkResult.equals("success")){
             jsonObject.put("status","fail");
             jsonObject.put("message",checkResult);
             return jsonObject;
         }
         if(jobId.equals("")) {
-            ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId, startTime, endTime, "", maxWorker);
+            ReviewJob newReviewJob = new ReviewJob(examId, caseId, name, description, Long.toString(System.currentTimeMillis()), paperId, startTime, endTime, singleTime,totalWorkload,"", maxWorker);
             jobId = jobDao.save(newReviewJob);
         }
         if(workerDistribution.equals("")||workerDistribution.equals("[]")){
@@ -164,7 +163,7 @@ public class ReviewJobService {
             for(int i=0;i<reports.size();i++){
                 reportIds.add(reports.get(i).getId());
             }
-            JSONObject jsonObject=uploadJob("",examId,caseId,jobName,jobDescription,paperId,startTime,endTime,workerList,"",0);
+            JSONObject jsonObject=uploadJob("",examId,caseId,jobName,jobDescription,paperId,startTime,endTime,0,0,workerList,"",0);
             // groupDao.save(new ReviewGroup("default","",workerList,jobId,reportIds));
             if(jsonObject.getString("status").equals("success")) {
                 messageVO.setStatus("200");
@@ -181,7 +180,7 @@ public class ReviewJobService {
         return messageVO;
     }
 
-    public JSONObject updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,List<String>workerList,String workerDistribution,int maxWorker){
+    public JSONObject updateJob(String jobId,String name, String description, String paperId,String startTime, String endTime,int singleTime, int totalWorkload,List<String>workerList,String workerDistribution,int maxWorker){
         ReviewJob reviewJob=jobDao.findJob(jobId);
         reviewJob.setName(name);
         reviewJob.setDescription(description);
@@ -191,7 +190,7 @@ public class ReviewJobService {
         jobDao.save(reviewJob);
         groupDao.removeByJob(jobId);
         reviewWorkerDao.removeByJob(jobId);
-        JSONObject jsonObject1=uploadJob(jobId,"","",name,description,paperId,startTime,endTime,workerList,workerDistribution,maxWorker);
+        JSONObject jsonObject1=uploadJob(jobId,"","",name,description,paperId,startTime,endTime,singleTime,totalWorkload,workerList,workerDistribution,maxWorker);
         return jsonObject1;
     }