From ddcc650816c104a82b471cd1e7fb94f132cb11ab Mon Sep 17 00:00:00 2001
From: flower <zloiet@163.com>
Date: Thu, 27 Dec 2018 22:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExamExaminationController.java |  7 +++-
 .../templates/exam/examExamination/add.html   | 38 ++++++++++++++++++-
 .../templates/exam/examExamination/edit.html  | 38 ++++++++++++++-----
 3 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamExaminationController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamExaminationController.java
index 5a4889086..9f151ee9b 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamExaminationController.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamExaminationController.java
@@ -113,8 +113,11 @@ public class ExamExaminationController extends BaseController
 	@PostMapping("/edit")
 	@ResponseBody
 	public AjaxResult editSave(ExamExamination examExamination)
-	{		
-		return toAjax(examExaminationService.updateById(examExamination));
+	{
+		examExamination.setDelFlag("0");
+		examExamination.setUpdateDate(new Date());
+		examExamination.setUpdateBy(ShiroUtils.getLoginName());
+		return toAjax(examExaminationService.updateSelectiveById(examExamination));
 	}
 	
 	/**
diff --git a/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html b/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html
index 52fa54a56..c2e5805f0 100644
--- a/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html
+++ b/ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html
@@ -22,7 +22,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">考试试卷：</label>
 				<div class="col-sm-3">
-					<input id="treeName" name="treeName" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
+					<input id="treeName" name="treeName" value="试卷分类" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
 				</div>
 				<div class="col-sm-5">
 					<select id="examPaperId" name="examPaperId" class="form-control m-b" >
@@ -114,13 +114,47 @@
     <script type="text/javascript">
 		var prefix = ctx + "exam/examExamination"
 
+        $(function () {
+            var config = {
+                url: ctx + "exam/examPaper"+ "/list",
+                type: "post",
+                dataType: "json",
+                data: {examPaperCategoryId:1},
+//                contentType:"application/json",
+                success: function(result) {
+
+                    $("#examPaperId").html("<option value=''>---请选择---</option>");
+                    var rows =result.rows;
+                    for(var i in rows){
+                        $("#examPaperId").append("<option value='"+rows[i].id+"'>"+rows[i].name+"</option>");
+                    }
+                }
+            };
+            $.ajax(config)
+        })
 
 
 		$("#form-examExamination-add").validate({
 			rules:{
-				xxxx:{
+                name:{
 					required:true,
 				},
+                examPaperId:{
+                    required:true,
+                },
+                startTime:{
+                    required:true,
+                },
+                endTime:{
+                    required:true,
+                },
+                passMark:{
+                    required:true,
+                },
+                timeLength:{
+                    required:true
+				}
+
 			}
 		});
 		
diff --git a/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html b/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html
index edeb93929..c9d9f1f96 100644
--- a/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html
+++ b/ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html
@@ -6,6 +6,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-examExamination-edit" th:object="${examExamination}">
             <input id="id" name="id" th:field="*{id}"  type="hidden">
+			<input id="paperId" name="paperId" th:value="${examExamination.examPaperId}"  type="hidden">
 			<div class="form-group">
 
 				<div class="form-group">
@@ -21,8 +22,8 @@
 						<input id="treeName" name="treeName" value="试卷分类" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
 					</div>
 					<div class="col-sm-5">
-						<select id="examPaperId" name="examPaperId" class="form-control m-b" >
-							<option>---请选择---</option>
+						<select id="examPaperId" name="examPaperId" class="form-control m-b"  >
+							<option value="">---请选择---</option>
 						</select>
 					</div>
 				</div>
@@ -113,14 +114,17 @@
                 url: ctx + "exam/examPaper"+ "/list",
                 type: "post",
                 dataType: "json",
-                data: {examPaperCategoryId:$("#examPaperId").val()},
+                data: {examPaperCategoryId:1},
 //                contentType:"application/json",
                 success: function(result) {
-                    $("#examPaperId").html("<option>---请选择---</option>");
+                    debugger
+                    var id = $("#paperId").val();
+                    $("#examPaperId").html("<option value=''>---请选择---</option>");
                     var rows =result.rows;
                     for(var i in rows){
                         $("#examPaperId").append("<option value='"+rows[i].id+"'>"+rows[i].name+"</option>");
                     }
+                    $("#examPaperId").val(id);
                 }
             };
             $.ajax(config)
@@ -128,11 +132,27 @@
 
 
 		$("#form-examExamination-edit").validate({
-			rules:{
-				xxxx:{
-					required:true,
-				},
-			}
+            rules:{
+                name:{
+                    required:true,
+                },
+                examPaperId:{
+                    required:true,
+                },
+                startTime:{
+                    required:true,
+                },
+                endTime:{
+                    required:true,
+                },
+                passMark:{
+                    required:true,
+                },
+                timeLength:{
+                    required:true
+                }
+
+            }
 		});
 		
 		function submitHandler() {