2.限制出题数为64

3.修改重复任课bug 4.修改按时间搜索，开始大于结束时间问题

2.限制出题数为64
3.修改重复任课bug 4.修改按时间搜索，开始大于结束时间问题
jack
1 parent 32d27bdc
Showing 7 changed files with 91 additions and 22 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/static/js/control-604.js
resources/mybatis1/sunvote/CourseManagementMapper.xml
src/com/fh/controller/sunvote/paper/PaperController.java
@@ -31,6 +31,16 @@
       <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
       <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <style>
+    	.date-picker{
+    		height:30px;
+    		line-height:30px;
+    	}
+    	.search_btn{
+    		display:inline-block;
+    		vertical-align:bottom;
+    	}
+    </style>
 </head>
 <body>
 	<form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }" method="post" name="Form" id="Form">
@@ -43,8 +53,8 @@
 			</div>
 			<div class="head_box_r">
 				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
-				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
-				 <a href="#" onclick="tosearch();"><img
+				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" id="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
+				 <a href="#" class="search_btn" onclick="tosearch();"><img
 					src="../static/images/search.png" /></a>
 			</div>
 			<div class="clear"></div>
@@ -94,11 +104,15 @@
 								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td>
-								<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
+								<c:if test="${var.PAPER_TYPE ==1 }">
+									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
+								</c:if>
 								<c:if test="${var.PAPER_TYPE ==2 }">
 									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析</a>
 								</c:if>
-								<a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
+								<c:if test="${var.PAPER_TYPE ==1 }">
+									<a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
+								</c:if>
 								</td>
 							</tr>
@@ -78,7 +78,7 @@
 						<th><div style="width:80px" title="及格率=及格人数/班级人数">及格率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px" title="得分<=30%">低分人数<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px" title="低分率=低分人数/班级人数">低分率<img src="../static/images/tip.png" style="width:16px"></div></th>
-						<th><div style="width:80px">操作</div></th>
+						<!-- <th><div style="width:80px">操作</div></th> -->
 					</tr>
 				</thead>
 				<tbody>
@@ -100,7 +100,7 @@
 									${myelfun:findClassName(var.class_id)}
 								  </c:if>
 								  <c:if test="${empty var.class_id }">
-									年级平均
+									班级平均
 								  </c:if>
 								</td>
 								<td >
@@ -172,7 +172,7 @@
 									value="${var.student_num == 0 ? 0: (var.difen / var.student_num * 100)}"
 									maxFractionDigits="2" />%
 								</td>
-								<td >
+								<%-- <td >
 								<c:if test="${not empty var.class_id }">
 								<a href="<%=basePath%>paper/paperRep2.do?MB1=${pd.MB1 }&CLASS_ID=${var.class_id}&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}&CREAT_TIME=${var.creat_time}">查看成绩</a>
@@ -181,7 +181,7 @@
 								<a href="<%=basePath%>paper/paperRep2.do?MB1=${pd.MB1 }&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
 								</c:if>
-								</td>
+								</td> --%>
 							</tr>
 						</c:forEach>
@@ -32,8 +32,8 @@
 			<div class="pull-left"><h3>总分：<span id='score_all'>0</span> 分</h3></div>
 			<div class="btn_box pull-right">
 				<input type="button" class="btn btn-success btn-lg" name="save" value="保存" id="save"/>
-				<button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">单选出题</button>
-				 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="addQuestion">多选出题</button> 	
+				<!-- <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".fast" id="fast">单选出题</button> -->
+				 <button type="button" class="btn btn-success btn-lg" data-toggle="modal" data-target=".addQuestion" id="addQuestion">添加试题</button> 	
 				<div class="clearfix"></div>
 			</div>
 		</div>
@@ -26,7 +26,16 @@
 <style>
 	.font span{    font-size: 12px;
     font-weight: initial;color:#000;}
-	</style>
+    .date-picker{
+    		height:30px;
+    		line-height:30px;
+    	}
+   	.search_btn{
+   		width:30px;
+   		display:inline-block;
+   		vertical-align:bottom;
+   	}
+</style>
 </head>
 <body style="background:#fff;">
@@ -62,13 +71,17 @@
 						class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
-					<td style="padding-left:2px"><a style="height:30px;"
+					<td style="padding-left:10px">
+					<a href="#" class="search_btn" onclick="tosearch();"><img
+					width="30px" src="static/images/search.png" /></a>
+					<!-- <a style="height:30px;"
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
 							id="nav-search-icon" style="line-height:20px"
-							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
-					<td style="padding-left:2px">
-						<a style="height:30px;width:3em"
-						class="btn btn-light btn-xs" onclick="export2();" title="导出">导出</a>
+							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a> --></td>
+					<td style="padding-left:10px">
+						<a style="height:30px;width:3em;padding:0;border:0;line-height:30px;border-radius:3px;"
+						class="btn btn-primary btn-xs" onclick="export2();" title="导出">导出</a>
+						
 					</td>
 				</tr>
 			</table>
@@ -240,7 +240,7 @@ $(function() {
 					option = String.fromCharCode(0x41 + j);
 					$(
 							".section-" + answer_index_b + " .question"
-									+ questionNUm + ' ul').append(
+									+ i + ' ul').append(
 							'<li class="btn btn-default">' + option + '</li>');
 				}
 			}
@@ -292,9 +292,12 @@ $(function() {
 			$(".section").eq(i).find(".que_num").text(SectionToChinese(i+1)+'、');
 			var className = $(".section").attr("class").replace(/\d+/g,i);
-			console.log(className)
 			$(".section").attr("class",className);
 		}
+		var section = $(this).parent().parent(".section");
+		var this_score = parseFloat(section.attr("data-score"));
+		total_score = total_score-this_score;
+		$("#score_all").text(total_score);
 	})
 	$("#fast_submit").click(function() { // 点击确定，创建答案列表
@@ -345,8 +348,13 @@ $(function() {
 			return;
 		}
 		// console.log(typeof(type_2));
-		addQuestion(type_2, num_ans_2, index_s_2, index_e_2, fraction2);
-		$('.addQuestion').modal('hide');
+		var qestion_num = $(".question").length+index_e_2;
+		if(qestion_num<=64){
+			addQuestion(type_2, num_ans_2, index_s_2, index_e_2, fraction2);
+			$('.addQuestion').modal('hide');
+		}else{
+			alert("题目总不能超过64题，请检查后在提交");
+		}
 	})
 	$("#type").change(function() {
 		if ($("#type").val() == 4) {
@@ -119,8 +119,8 @@
 		where 
 			1 =1 
 			and TEACHER_ID  = #{TEACHER_ID} 
-			and CLASS_ID= #{TEACHER_ID} 	
-			and SUBJECT_ID= #{TEACHER_ID} 	
+			and CLASS_ID= #{CLASS_ID} 	
+			<!-- and SUBJECT_ID= #{SUBJECT_ID}  -->	
 			limit 0,1
 	</select>
@@ -50,6 +50,7 @@ import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.ObjectExcelView2;
 import com.fh.util.PageData;
+import com.hp.hpl.sparta.ParseException;
 /**
  * 说明：试卷 创建时间：2018-05-17
@@ -1188,6 +1189,17 @@ public class PaperController extends BaseController {
 		String userID = getUserID();
 		pd.put("USER_ID", userID);
 		pd.put("PAPER_TYPE", "1");
+		String last_start = pd.getString("LASTSTART");
+		String last_end = pd.getString("LASTEND");
+		if(!last_start.isEmpty()&&!last_end.isEmpty()){
+			DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); 
+			Date begin = fmt.parse(last_start); //开始时间
+			Date end = fmt.parse(last_end);   //结束时间
+			if(begin.compareTo(end)==1){
+				pd.put("LASTSTART", last_end);
+				pd.put("LASTEND", last_start);
+			}
+		}
 		page.setPd(pd);
 		List<PageData> varList = paperService.listAllBySidAndTid(pd); // 列出Paper列表
 		page.setLangIsChina(isChineseLanguageClient());
@@ -1251,6 +1263,17 @@ public class PaperController extends BaseController {
 			pd.put("keywords", keywords.trim());
 		}
 		pd.put("PAPER_TYPE", "1");
+		String last_start = pd.getString("LASTSTART");
+		String last_end = pd.getString("LASTEND");
+		if(!last_start.isEmpty()&&!last_end.isEmpty()){
+			DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); 
+			Date begin = fmt.parse(last_start); //开始时间
+			Date end = fmt.parse(last_end);   //结束时间
+			if(begin.compareTo(end)==1){
+				pd.put("LASTSTART", last_end);
+				pd.put("LASTEND", last_start);
+			}
+		}
 		page.setPd(pd);
 		page.setLangIsChina(isChineseLanguageClient());
 		List<PageData> varList = paperService.list(page); // 列出Paper列表
@@ -1329,6 +1352,17 @@ public class PaperController extends BaseController {
 		}
 		pd.put("PAPER_TYPE", "2");
 		pd.put("USER_ID", this.getUserID());
+		String last_start = pd.getString("LASTSTART");
+		String last_end = pd.getString("LASTEND");
+		if(!last_start.isEmpty()&&!last_end.isEmpty()){
+			DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); 
+			Date begin = fmt.parse(last_start); //开始时间
+			Date end = fmt.parse(last_end);   //结束时间
+			if(begin.compareTo(end)==1){
+				pd.put("LASTSTART", last_end);
+				pd.put("LASTEND", last_start);
+			}
+		}
 		page.setPd(pd);
 		page.setLangIsChina(isChineseLanguageClient());
 		List<PageData> varList = paperService.list(page); // 列出Paper列表