浏览代码

去掉获取人员分配信息

insomniaLee 5 年之前
父节点
当前提交
004db1992b

+ 5 - 2
src/main/java/com/mooctest/controller/JobController.java

@@ -119,8 +119,11 @@ public class JobController {
             model.addAttribute("job",detail);
             JSONObject paper = paperService.getSinglePaper((String)detail.get("paper_id"));
             model.addAttribute("paper",paper);
-            String distribute  = jobService.getDistribution(id);
-            model.addAttribute("distribute" , distribute);
+//            if(!(boolean)detail.get("dynamic")){
+//
+//            }
+//            String distribute  = jobService.getDistribution(id);
+            model.addAttribute("distribute" , "");
             String workerStr = jobService.getWrokers(id).toString();
             model.addAttribute("workers",workerStr.substring(1,workerStr.length()-1));
             model.addAttribute("reportHost",reportHost);

+ 8 - 3
src/main/java/com/mooctest/service/JobService.java

@@ -58,6 +58,7 @@ public class JobService {
         paramMap.add("totalWorkload", totalWorkload);
         paramMap.add("singleTime", singleTime);
         paramMap.add("maxWorker",workNum);
+        paramMap.add("isDynamic",true);
 //        System.out.println(paramMap.toString());
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         HttpHeaders headers = new HttpHeaders();
@@ -87,8 +88,6 @@ public class JobService {
         paramMap.add("singleTime", singleTime);
         paramMap.add("maxWorker",workNum);
         paramMap.add("distribute",distribute);
-
-//        System.out.println(paramMap.toString());
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         HttpHeaders headers = new HttpHeaders();
         HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<MultiValueMap<String, Object>>(paramMap,headers);
@@ -101,7 +100,7 @@ public class JobService {
         RestTemplate template = new RestTemplate();
         String url = auditDistributeUrl+"updateAbility";
         MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
-        paramMap.add("jobId",jobId);
+        paramMap.add("jobId","dynamic100");
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         HttpHeaders headers = new HttpHeaders();
         HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<MultiValueMap<String, Object>>(paramMap,headers);
@@ -150,6 +149,12 @@ public class JobService {
         return tasksJson;
     }
 
+    // TODO: 2020/4/3 该方法已经废弃 
+    /**
+     * 方法已经废弃
+     * @param jobId
+     * @return
+     */
     public String getDistribution (String jobId){
         RestTemplate template = new RestTemplate();
         String url = HTTP+reportHost+"/Bug/api/job/getWorkerDistribution";

+ 3 - 3
src/main/resources/templates/changeReviewJob.html

@@ -212,21 +212,21 @@
                             <label class="col-sm-2 control-label">单人工作量(分钟)</label>
                             <div class="col-sm-8">
                                 <!--                                xuao xiugai wei maxWorker-->
-                                <input id="singleTime"  th:value="${job.get('singleTime')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入单人工作量"/>
+                                <input id="singleTime"  th:value="${job.get('single_time')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入单人工作量"/>
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">总工作量(分钟)</label>
                             <div class="col-sm-8">
                                 <!--                                xuao xiugai wei maxWorker-->
-                                <input id="totalWorkload"  th:value="${job.get('totalWorkload')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入总工作量"/>
+                                <input id="totalWorkload"  th:value="${job.get('total_workload')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入总工作量"/>
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">最大工人总数</label>
                             <div class="col-sm-8">
 <!--                                xuao xiugai wei maxWorker-->
-                                <input id="workNum"  th:value="${job.get('validationNum')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入工人总数"/>
+                                <input id="workNum"  th:value="${job.get('max_worker')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入工人总数"/>
                             </div>
                         </div>
                         <!-- textarea -->