Pārlūkot izejas kodu

添加动态分配选项

insomniaLee 5 gadi atpakaļ
vecāks
revīzija
f5142a9ef1

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

@@ -67,8 +67,9 @@ public class JobController {
                                 @RequestParam("name") String name, @RequestParam("description") String descriptioin,
                                 @RequestParam("workers")List<String> workers , @RequestParam("workNum") int workNum,
                                 @RequestParam("itemGroupList") String itemGroupList, @RequestParam("totalWorkload") int totalWorkload,
-                                @RequestParam("singleTime") int singleTime){
-        JSONObject data = jobService.changeJob(jobId,name,descriptioin,time,paperId,workers,itemGroupList,workNum,totalWorkload,singleTime);
+                                @RequestParam("singleTime") int singleTime,
+                                @RequestParam("dynamic") boolean dynamic){
+        JSONObject data = jobService.changeJob(jobId,name,descriptioin,time,paperId,workers,itemGroupList,workNum,totalWorkload,singleTime,dynamic);
 
         return data;
     }

+ 2 - 2
src/main/java/com/mooctest/service/JobService.java

@@ -40,7 +40,7 @@ public class JobService {
 
 
     public JSONObject changeJob (String jobId,String name, String desciption, String time, String paperId, List<String> userList, String workDistribution,
-                                 int workNum,int totalWorkload,int singleTime){
+                                 int workNum,int totalWorkload,int singleTime,boolean dynamic){
         RestTemplate template = new RestTemplate();
         if(!time.contains(" - ")){
             return null;
@@ -59,7 +59,7 @@ public class JobService {
         paramMap.add("totalWorkload", totalWorkload);
         paramMap.add("singleTime", singleTime);
         paramMap.add("maxWorker",workNum);
-        paramMap.add("isDynamic",true);
+        paramMap.add("isDynamic",dynamic);
 //        System.out.println(paramMap.toString());
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         HttpHeaders headers = new HttpHeaders();

+ 1 - 0
src/main/resources/static/js/addReviewJob.js

@@ -163,6 +163,7 @@ changeJob = function(){
     data.append('totalWorkload',$('#totalWorkload').val());
     data.append('itemGroupList',$('#deliverInfo').val());
     data.append('workers',$('#workList').val());
+    data.append('dynamic',$('#distributeType').val()=='动态分配')
     console.log(data)
     $.ajax({
         url: '/review/changejob',

+ 2 - 2
src/main/resources/static/js/add_paper.js

@@ -680,12 +680,12 @@ getNewRatioIndex = function () {
 generateJson = function( type ){
     // 遍历页面上的数据,生成json数据。
     var data = new Object();
-    var is_Objective = false;
+    // var is_Objective = false;
     data.description = $('#description').val();
     data.name = $('#name').val();
     // data.time = $('#reservationtime').val();
     data.type = $('#testType').val();
-    if($('#testType'))
+    // if($('#testType'))
     data.application_url = "http://www.mooctest.net/assets/img/mooctest.png";
     data.requirement_url = "http://www.mooctest.net/assets/img/mooctest.png";
     data.report_num = str2number( $('#reportNum').val() );

+ 10 - 0
src/main/resources/templates/changeReviewJob.html

@@ -183,6 +183,16 @@
                             <!-- /.input group -->
                         </div>
                         <!-- select -->
+                        <!-- select -->
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" >分配类型</label>
+                            <div class=" col-sm-10">
+                                <select class="form-control" id="distributeType">
+                                    <option>静态分配</option>
+                                    <option>动态分配</option>
+                                </select>
+                            </div>
+                        </div>
 
                         <!-- text input -->
 <!--                        <div class="form-group">-->