0830版本

孙向锦
1 parent ff7ab13e
Showing 12 changed files with 174 additions and 16 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
WebRoot/static/js/paper_view.js
WebRoot/static/js/paper_view1.js
WebRoot/static/js/paper_view2.js
WebRoot/static/js/set_question.js
WebRoot/static/js/teach_paper.js
WebRoot/static/js/test_list.js
resources/mybatis1/api/V1Mapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/service/api/V1Manager.java
src/com/fh/service/api/impl/V1Service.java
@@ -143,7 +143,7 @@
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/js/echars.js"></script>
-	<script src="../static/js/paper_view1.js?a=1"></script>
+	<script src="../static/js/paper_view1.js?a=2"></script>
 </html>
@@ -66,6 +66,11 @@ function getQueryString(name) {
 						star(j,parseInt(data.data[j].DIFFICULTY));
 					}
 				}
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
@@ -157,6 +162,11 @@ function getQueryString(name) {
 			success:function(data){
 				alert("上传成功");
 				window.history.go(-2);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})	
 	 })
 \ No newline at end of file
@@ -119,6 +119,8 @@ function getQueryString(name) {
 						}
 						for(k=0;k<answerinfo.length;k++){
 							data1[k]=parseInt(answerinfo[k].COUNT);
+							if(answerinfo[k].ANSWER=="")
+								answerinfo[k].ANSWER="未答";
 							data2[k]=answerinfo[k].ANSWER;
 							color[k]="#fcb35b";
 							if(answerinfo[k].ISRIGHT==1){
@@ -140,6 +142,11 @@ function getQueryString(name) {
 							$(".analysis ul").children("li").eq(j).append('<div class="chou">抽</div>');
 					}
 				}
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	})
@@ -166,9 +173,16 @@ function getQueryString(name) {
 			success:function(data){
 				console.log(data);
 				for(var i=0;i<data.data.length;i++){
+					if(typeof(data.data[i].ANSWER)=="undefined")
+						data.data[i].ANSWER="未答";
 					student_html+='<tr><td>'+(i+1)+'</td><td>'+data.data[i].NAME+'</td><td>'+data.data[i].ANSWER+'</td><td>'+data.data[i].PRESS_TIME+'秒</td></tr>';
 				}
 				$(".student_list").html(student_html);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		});
 		$('#myModal').modal('show');
@@ -55,6 +55,11 @@ function getQueryString(name) {
 					}
 				}
 				window.top.loading.remove();
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	})
@@ -42,6 +42,11 @@ var url=&quot;&quot;;
 				}
 				$(".section").children("ul").html(point_html);
 				getQuestion($(".section li").eq(0));
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	}
@@ -63,6 +68,11 @@ var url=&quot;&quot;;
 					}
 				}
 				getQuestion($(".section li").eq(0));
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	}
@@ -83,6 +93,11 @@ var url=&quot;&quot;;
 					_html +='<li data-id="'+data.data[i].KNOWLEDGE_ID+'" data-img-click=0 data-span-click=0 ><img src="../static/images/add.png" class="add"/><span>'+(i+1)+data.data[i].NAME+'</span></li>';
 				}
 				obj.children('ul').html(_html);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	}
@@ -153,7 +168,7 @@ var url=&quot;&quot;;
 				// 状态
 				console.log(XMLHttpRequest.readyState);
 				// 错误信息   
-				console.log(textStatus);
+				alert(textStatus);
 				flag=0;
 				pageNum-=1;
 				if(pageNum<1)
@@ -203,7 +218,12 @@ var url=&quot;&quot;;
 				$("#book_name").text($(".name").eq(0).text()+"/"+$(".float_box").eq(0).find('li').eq(0).text());
 				}
-			}	
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
 		})
 	}
@@ -220,6 +240,11 @@ var url=&quot;&quot;;
 						textBookName[i]={"name":data.data[i].NAME,"id":data.data[i].ID};
 					}
 				}
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 		return textBookName;
@@ -232,6 +257,11 @@ var url=&quot;&quot;;
 			data:{id:class_id},
 			success:function(data){
 				$(".classList li").html(data.data);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 			}
 		})
 	}
@@ -26,6 +26,11 @@
 						$("#dealer_id_2").html(option_html);
 					}
 					getList();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
 				}
 			})
@@ -60,7 +65,12 @@
 					}
 					$("#tab_body").html(tab_html);
 					window.top.loading.remove();
-				}
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
 			});
 		}
 		$('#ids').on('click', function(){
@@ -106,7 +116,12 @@
 				data:{id:id},
 				success:function(data){
 					subjectName=data.data;
-				}
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
 			})
 			return subjectName;
 		}
@@ -119,7 +134,12 @@
 				data:{id:id},
 				success:function(data){
 					className=data.data;
-				}
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
 			})
 			return className;
 		}
@@ -10,8 +10,7 @@ function getQueryString(name) {
 	return null;
 }
 var class_id = getQueryString("classid");
-$(document)
-		.ready(
+$(document).ready(
 				function() {
 					$.ajax({
@@ -32,6 +31,11 @@ $(document)
 										$("#dealer_id_2").html(option_html);
 									}
 									getList();
+								},
+								error: function (XMLHttpRequest, textStatus, errorThrown) {
+									// 错误信息   
+									alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+									window.top.loading.remove();
 								}
 							})
 					// 日期框
@@ -76,6 +80,11 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
 								+ '" >查看</a></td></tr>'
 					}
 					$("#tab_body").html(tab_html);
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					// 错误信息   
+					alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+					window.top.loading.remove();
 				}
 			});
 }
@@ -109,7 +118,12 @@ function getClassName(id) { // 获取班级中文名
 		},
 		success : function(data) {
 			className = data.data;
-		}
+		},
+		error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
 	})
 	return className;
 }
@@ -181,6 +181,44 @@
 	</select>
+   <select id="getLastWrongQuestionInfo"  parameterType="pd" resultType="pd">
+   
+		 SELECT
+				sv_question.QUESTION_ID,
+				sv_question.CONTENT,
+				sv_testpaper.`NAME`,
+				sv_paper.TITLE,
+				sv_testpaperinfo.TESTPAPERINFO_ID,
+				sv_testpaperinfo.PAPER_ID,
+				sv_testpaperinfo.TEST_ID,
+				sv_testpaper.CREATE_DATE,
+				count(*) AS WRONG_NUM
+			FROM
+				sv_testpaperinfo
+			LEFT JOIN sv_question ON sv_question.QUESTION_ID = sv_testpaperinfo.QUESTION_ID
+			LEFT JOIN sv_testpaper ON sv_testpaperinfo.TEST_ID = sv_testpaper.TESTPAPER_ID
+			LEFT JOIN sv_paper ON sv_testpaperinfo.PAPER_ID = sv_paper.PAPER_ID
+			WHERE 
+				sv_testpaperinfo.`RIGHT` = '0'
+			AND sv_question.QUESTION_FROM = '101'
+			<if test="START_DATE != null and START_DATE != ''">
+				AND sv_testpaper.CREATE_DATE &gt; #{START_DATE}
+			</if>
+			<if test="END_DATE != null and END_DATE != ''">
+				AND sv_testpaper.CREATE_DATE &lt; #{END_DATE}
+			</if>
+			GROUP BY
+				sv_testpaperinfo.QUESTION_ID,sv_testpaperinfo.TEST_ID
+			ORDER BY
+				WRONG_NUM DESC
+				
+			<if test="COUNT != null and COUNT != ''">
+				LIMIT ${COUNT}
+			</if>
+			<if test="COUNT == null or COUNT == ''">
+				LIMIT 5
+			</if>
+   </select>
@@ -561,10 +561,10 @@ public class V1 extends BaseController {
 									.getString("PROBLEM_TYPE_ID"));
 							question.setRank(qpd.getString("RANK"));
 							question.setNo_name(qpd.getString("NO_NAME"));
+							question.setQuestions(new ArrayList<Question>());
 							if ("-1".equals("" + qpd.getString("P_ID"))) {
 								PageData pidPd = new PageData();
 								pidPd.put("PID", question.getQuestion_id());
-								question.setQuestions(new ArrayList<Question>());
 								List<PageData> qs = v1Service
 										.getQuestionsByPID(pidPd);
 								for (PageData q : qs) {
@@ -1471,7 +1471,7 @@ public class V1 extends BaseController {
 						testPaper.getCreateDate() == null ? Tools
 								.date2Str(new Date()) : testPaper
 								.getCreateDate());
-				testPd.put("TEST_TYPE", testPaper.getTest_type() != null ? testPaper.getTest_type() :"101");
+				testPd.put("TEST_TYPE", testPaper.getTest_type() != null ? testPaper.getTest_type() :"1");
 				List<PageData> listData = testpaperService.listAll(testPd);
 				if (!(listData != null && listData.size() > 0)) {
 					testPd.put("START_DATE", testPaper.getStartDate());
@@ -1563,7 +1563,7 @@ public class V1 extends BaseController {
 		return res.toJson();
-	}
+	} 
 	/**
 	 *  上传测验成绩
@@ -1590,7 +1590,7 @@ public class V1 extends BaseController {
 						testPaper.getCreateDate() == null ? Tools
 								.date2Str(new Date()) : testPaper
 								.getCreateDate());
-				testPd.put("TEST_TYPE", testPaper.getTest_type() != null ? testPaper.getTest_type() :"101");
+				testPd.put("TEST_TYPE", testPaper.getTest_type() != null ? testPaper.getTest_type() :"1");
 				List<PageData> listData = testpaperService.listAll(testPd);
 				if ((listData != null && listData.size() > 0)) {
 					testPaperId = listData.get(0).getString("TESTPAPER_ID");
@@ -1794,7 +1794,7 @@ public class V1 extends BaseController {
 		} else {
 			res.setDataError();
 		}
-		logger.info("uploadupdatetestpaper cost time:"
+		logger.info("uploadupdateTestpaper2 cost time:"
 				+ (System.currentTimeMillis() - cur));
 		return res.toJson();
@@ -2788,6 +2788,23 @@ public class V1 extends BaseController {
 	}
+	/**
+	 * 根据ID班级名称
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/wrongquestion", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public  String wrongquestion() throws Exception {
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		PageData pageData = this.getPageData();
+		List<PageData> list = v1Service.getLastWrongQuestionInfo(pageData);
+		res.setData(list);
+		return res.toJson();
+		
+	}
+	
 	@RequestMapping(value = "/uploadfile", produces = "application/json;charset=UTF-8")
 	@ResponseBody
 	public String uploadFile(@RequestParam(value="file",required=false)MultipartFile file, HttpServletRequest request) throws Exception{
@@ -184,6 +184,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("userId", userId);
 		mv.setViewName("sunvote/teacher/test_list");
 		mv.addObject("pd", pd);
 		return mv;
@@ -202,6 +203,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("userId", userId);
 		mv.setViewName("sunvote/teacher/paper_view");
 		mv.addObject("pd", pd);
 		return mv;
@@ -220,6 +222,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("userId", userId);
 		mv.setViewName("sunvote/teacher/paper_view2");
 		mv.addObject("pd", pd);
 		return mv;
@@ -238,6 +241,7 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("userId", userId);
 		mv.setViewName("sunvote/teacher/paper_view1");
 		mv.addObject("pd", pd);
 		return mv;
@@ -253,8 +257,10 @@ public class TeacherController extends BaseController {
 	public ModelAndView set_question(Page page) throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Paper");
 		ModelAndView mv = this.getModelAndView();
+		String userId = this.getUserID();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("userId", userId);
 		mv.setViewName("sunvote/teacher/set_question");
 		mv.addObject("pd", pd);
 		return mv;
@@ -14,12 +14,11 @@ public interface V1Manager {
 	public List<PageData> getTestPaperInfo(PageData pd) throws Exception;
-	
 	public List<PageData> getQuestionsByPID(PageData pd) throws Exception;
 	public List<PageData> getTeacherInfo(PageData pd) throws Exception;
 	public List<PageData> getQuestionWrongInfo(PageData pd) throws Exception ;
-	
+	public List<PageData> getLastWrongQuestionInfo(PageData pd) throws Exception;
 }
@@ -50,5 +50,10 @@ public class V1Service implements V1Manager {
 	public List<PageData> getQuestionWrongInfo(PageData pd) throws Exception {
 		return (List<PageData>)dao.findForList("V1Mapper.getQuestionWrongInfo", pd);
 	}
+	
+	@Override
+	public List<PageData> getLastWrongQuestionInfo(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("V1Mapper.getLastWrongQuestionInfo", pd);
+	}
 }