修复工人信息问题

src/main/java/com/mooctest/controller/JobController.java

@@ -125,6 +125,7 @@ public class JobController {
 //            }
 //            String distribute  = jobService.getDistribution(id);
             model.addAttribute("distribute" , "");
+            model.addAttribute("distributeType" , ((boolean)detail.get("dynamic"))?"动态分配":"静态分配" );
             String workerStr = jobService.getWrokers(id).toString();
             model.addAttribute("workers",workerStr.substring(1,workerStr.length()-1));
             model.addAttribute("reportHost",reportHost);

src/main/java/com/mooctest/service/JobService.java

@@ -39,7 +39,8 @@ public class JobService {
     }
 
 
-    public JSONObject changeJob (String jobId,String name, String desciption, String time, String paperId, List<String> userList, String workDistribution,
+    public JSONObject changeJob (String jobId,String name, String desciption, String time,
+                                 String paperId, List<String> userList, String workDistribution,
                                  int workNum,int totalWorkload,int singleTime,boolean dynamic){
         RestTemplate template = new RestTemplate();
         if(!time.contains(" - ")){
@@ -54,7 +55,8 @@ public class JobService {
         paramMap.add("paperId", paperId);
         paramMap.add("startTime", TimeUtil.str2Timestamp(times[0]));
         paramMap.add("endTime", TimeUtil.str2Timestamp(times[1]));
-        paramMap.add("workerList", userList);
+        String temp = listToStr(userList);
+        paramMap.add("workerList", listToStr(userList));
         paramMap.add("workerDistribution", workDistribution);
         paramMap.add("totalWorkload", totalWorkload);
         paramMap.add("singleTime", singleTime);
@@ -184,4 +186,15 @@ public class JobService {
         return  workers2;
     }
 
+    private String listToStr ( List<String> data ){
+        StringBuffer sb = new StringBuffer();
+        for(String s : data){
+            sb.append(s);
+            sb.append(",");
+        }
+        if(data.size()!=0)
+            sb.deleteCharAt(sb.length()-1);
+        return sb.toString();
+    }
+
 }

src/main/java/com/mooctest/util/TimeUtil.java

@@ -9,8 +9,9 @@ import java.util.Date;
 
 public class TimeUtil {
 
+    static DateFormat dateFormat = new SimpleDateFormat("MM/dd/YYYY hh:mm a");
 
-    static DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm a");
+    static DateFormat dateFormatTimeStamp = new SimpleDateFormat("MM/dd/yyyy HH:mm a");
     static DateFormat dateFormatSimple = new SimpleDateFormat("YYYY-MM-dd");
 
     public static String timestamp2str (String timestamp ) {
@@ -36,7 +37,7 @@ public class TimeUtil {
     public static long str2Timestamp ( String timeStr ){
         Date date = null;
         try {
-            date = dateFormat.parse(timeStr);
+            date = dateFormatTimeStamp.parse(timeStr);
         } catch (ParseException e) {
             e.printStackTrace();
         }

src/main/resources/templates/changeReviewJob.html

@@ -187,7 +187,7 @@
                         <div class="form-group">
                             <label class="col-sm-2 control-label" >分配类型</label>
                             <div class=" col-sm-10">
-                                <select class="form-control" id="distributeType">
+                                <select class="form-control" id="distributeType" th:value="${distributeType}">
                                     <option>静态分配</option>
                                     <option>动态分配</option>
                                 </select>