修改前端form表单

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

@@ -53,9 +53,9 @@ public class JobController {
     public JSONObject postJon ( @RequestParam("paperId")String paperId,@RequestParam("time")String time,
                             @RequestParam("name") String name, @RequestParam("description") String descriptioin,
                             @RequestParam("workNum") int workNum,
-                            @RequestParam("itemGroupList") String itemGroupList, @RequestParam("crossCertify") String crossCertify,
-                            @RequestParam("crossCertifyNum") int crossCertifyNum){
-        JSONObject data = jobService.addJob(name,descriptioin,time,paperId,new ArrayList<String>(),itemGroupList,workNum,crossCertify,crossCertifyNum);
+                            @RequestParam("itemGroupList") String itemGroupList, @RequestParam("totalWorkload") int totalWorkload,
+                            @RequestParam("singleTime") int singleTime){
+        JSONObject data = jobService.addJob(name,descriptioin,time,paperId,new ArrayList<String>(),itemGroupList,workNum,totalWorkload,singleTime);
         return data;
     }
 
@@ -66,9 +66,9 @@ public class JobController {
                                 @RequestParam("paperId") String paperId,@RequestParam("time")String time,
                                 @RequestParam("name") String name, @RequestParam("description") String descriptioin,
                                 @RequestParam("workers")List<String> workers , @RequestParam("workNum") int workNum,
-                                @RequestParam("itemGroupList") String itemGroupList, @RequestParam("crossCertify") String crossCertify,
-                                @RequestParam("crossCertifyNum") int crossCertifyNum){
-        JSONObject data = jobService.changeJob(jobId,name,descriptioin,time,paperId,workers,itemGroupList,workNum,crossCertify,crossCertifyNum);
+                                @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);
 
         return data;
     }

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

@@ -38,7 +38,7 @@ public class JobService {
 
 
     public JSONObject changeJob (String jobId,String name, String desciption, String time, String paperId, List<String> userList, String workDistribution,
-                                 int workNum,String crossCertify,int crossCertifyNum){
+                                 int workNum,int totalWorkload,int singleTime){
         RestTemplate template = new RestTemplate();
         if(!time.contains(" - ")){
             return null;
@@ -54,8 +54,8 @@ public class JobService {
         paramMap.add("endTime", times[1]);
         paramMap.add("workerList", userList);
         paramMap.add("workerDistribution", workDistribution);
-        paramMap.add("isCrossValidation", crossCertify.equals("是"));
-        paramMap.add("validationNum", crossCertifyNum);
+        paramMap.add("totalWorkload", totalWorkload);
+        paramMap.add("singleTime", singleTime);
         paramMap.add("maxWorker",workNum);
 //        System.out.println(paramMap.toString());
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
@@ -67,7 +67,7 @@ public class JobService {
     }
 
     public JSONObject addJob (String name, String desciption, String time, String paperId, List<String> userList, String workDistribution,
-                              int workNum,String crossCertify,int crossCertifyNum){
+                              int workNum,int totalWorkload,int singleTime){
         RestTemplate template = new RestTemplate();
         if(!time.contains(" - ")){
             return null;
@@ -82,8 +82,8 @@ public class JobService {
         paramMap.add("endTime", times[1]);
         paramMap.add("workerList", userList);
         paramMap.add("workerDistribution", workDistribution);
-        paramMap.add("isCrossValidation", crossCertify.equals("是"));
-        paramMap.add("validationNum", crossCertifyNum);
+        paramMap.add("totalWorkload", totalWorkload);
+        paramMap.add("singleTime", singleTime);
         paramMap.add("maxWorker",workNum);
 //        System.out.println(paramMap.toString());
         template.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));

src/main/resources/static/js/addReviewJob.js

@@ -157,8 +157,10 @@ changeJob = function(){
     data.append('paperId',id);
     data.append('time',$('#reservationtime').val());
     data.append('workNum',$('#workNum').val());
-    data.append('crossCertify',$('#crossCertify').val());
-    data.append('crossCertifyNum',$('#certifyNum').val());
+    // data.append('crossCertify',$('#crossCertify').val());
+    // data.append('crossCertifyNum',$('#certifyNum').val());
+    data.append('singleTime',$('#singleTime').val());
+    data.append('totalWorkload',$('#totalWorkload'));
     data.append('itemGroupList',$('#deliverInfo').val());
     data.append('workers',$('#workList').val());
     console.log(data)
@@ -216,12 +218,14 @@ generateJson = function( type ){
     // data.append('group',$('#workerGroup').val());
 
     data.append('workNum',$('#workNum').val());
-    data.append('crossCertify',$('#crossCertify').val());
-    if($('#certifyNum').val() == ''){
-        data.append('crossCertifyNum',1);
-    }else{
-        data.append('crossCertifyNum',$('#certifyNum').val());
-    }
+    // data.append('crossCertify',$('#crossCertify').val());
+    // if($('#certifyNum').val() == ''){
+    //     data.append('crossCertifyNum',1);
+    // }else{
+    //     data.append('crossCertifyNum',$('#certifyNum').val());
+    // }
+    data.append('singleTime',$('#singleTime').val());
+    data.append('totalWorkload',$('#totalWorkload'));
     data.append('itemGroupList',$('#deliverInfo').val());
     console.log(data.toString())
     $.ajax({

src/main/resources/templates/addReviewJob.html

@@ -202,18 +202,17 @@
 <!--                        </div>-->
                         <!-- select -->
                         <div class="form-group">
-                            <label class="col-sm-2 control-label" >交叉认证</label>
-                            <div class=" col-sm-1">
-                                <select onchange="changeCertify()" class="form-control" id="crossCertify">
-                                    <option>否</option>
-                                    <option>是</option>
-                                </select>
+                            <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="请输入单人工作量"/>
                             </div>
                         </div>
-                        <div class="form-group" id="certifyBlock" style="display: none">
-                            <label class="col-sm-2 control-label">交叉验证人数</label>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">总工作量（分钟）</label>
                             <div class="col-sm-8">
-                                <input id="certifyNum" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入交叉验证人数"/>
+                                <!--                                xuao xiugai wei maxWorker-->
+                                <input id="totalWorkload"  th:value="${job.get('totalWorkload')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入总工作量"/>
                             </div>
                         </div>
                         <!-- text input -->
@@ -377,13 +376,13 @@
         window.open("/paperDetail?id="+paperId);
     }
 
-    changeCertify = function () {
-        var ceirity = $("#crossCertify").val();
-        if(ceirity == '是'){
-            $('#certifyBlock').css('display','block');
-        }else{ // fou
-            $('#certifyBlock').css('display','none');
-        }
+    // changeCertify = function () {
+    //     var ceirity = $("#crossCertify").val();
+    //     if(ceirity == '是'){
+    //         $('#certifyBlock').css('display','block');
+    //     }else{ // fou
+    //         $('#certifyBlock').css('display','none');
+    //     }
     }
 
 </script>

src/main/resources/templates/changeReviewJob.html

@@ -192,22 +192,36 @@
 <!--                            </div>-->
 <!--                        </div>-->
                         <!-- select -->
+<!--                        <div class="form-group">-->
+<!--                            <label class="col-sm-2 control-label" >交叉认证</label>-->
+<!--                            <div class=" col-sm-1">-->
+<!--                                <select onchange="changeCertify()" class="form-control" id="crossCertify" >-->
+<!--                                    <option>否</option>-->
+<!--                                    <option>是</option>-->
+<!--                                </select>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                        <div class="form-group" id="certifyBlock" style="display: none">-->
+<!--                            <label class="col-sm-2 control-label">交叉验证人数</label>-->
+<!--                            <div class="col-sm-8">-->
+<!--                                <input id="certifyNum" th:value="${job.get('validationNum')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入交叉验证人数"/>-->
+<!--                            </div>-->
+<!--                        </div>-->
+                        <!-- text input -->
                         <div class="form-group">
-                            <label class="col-sm-2 control-label" >交叉认证</label>
-                            <div class=" col-sm-1">
-                                <select onchange="changeCertify()" class="form-control" id="crossCertify" >
-                                    <option>否</option>
-                                    <option>是</option>
-                                </select>
+                            <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="请输入单人工作量"/>
                             </div>
                         </div>
-                        <div class="form-group" id="certifyBlock" style="display: none">
-                            <label class="col-sm-2 control-label">交叉验证人数</label>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">总工作量（分钟）</label>
                             <div class="col-sm-8">
-                                <input id="certifyNum" th:value="${job.get('validationNum')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入交叉验证人数"/>
+                                <!--                                xuao xiugai wei maxWorker-->
+                                <input id="totalWorkload"  th:value="${job.get('totalWorkload')}" onchange="checkNum(event)"  type="text" class="form-control" placeholder="请输入总工作量"/>
                             </div>
                         </div>
-                        <!-- text input -->
                         <div class="form-group">
                             <label class="col-sm-2 control-label">最大工人总数</label>
                             <div class="col-sm-8">
@@ -226,7 +240,7 @@
                         <div class="form-group">
                             <label class="col-sm-2 control-label">报告分配信息</label>
                             <div class="col-sm-10">
-                                <textarea class="form-control" th:text="${distribute}" id="deliverInfo" onchange="checkNull(event)" rows="8" placeholder="请输入json格式的报告分配信息"></textarea>
+                                <textarea class="form-control" th:text="${''}" id="deliverInfo" onchange="checkNull(event)" rows="8" placeholder="请输入json格式的报告分配信息"></textarea>
                             </div>
                         </div>
                     </form>
@@ -333,7 +347,7 @@
     var endTime = [[${job.get('end_time')}]]
     var jobId = [[${job.get('id')}]]
     var reportHost = [[${reportHost}]]
-    var crossValidation = [[${job.get('crossValidation')}]]
+    // var crossValidation = [[${job.get('crossValidation')}]]
     /*]]>*/
 
 
@@ -345,10 +359,10 @@
 
         ruleId = 0;
         ratioIndex =0 ;
-        $('#deliverInfo').val(getCleanStr($('#deliverInfo').val()));
+        //$('#deliverInfo').val(getCleanStr($('#deliverInfo').val()));
         //setShowDistribute($('#deliverInfo').val());
-        $('#crossCertify').val(crossValidation?'是':'否')
-        changeCertify();
+        // $('#crossCertify').val(crossValidation?'是':'否')
+        // changeCertify();
 
 
         //Date range picker

src/main/resources/templates/jobDetail.html

@@ -242,7 +242,7 @@
                                     </div>
                                 </div>
                                 <div class="col-md-6" id="statRight">
-                                    
+
 
 
                                     <div class="box">