Merge branch '标准版' of http://120.78.57.84/Elvis/SunvoteEducation into 标准版

jack
2 parents 89ac0783 c34a91ee
Showing 5 changed files with 426 additions and 100 deletions
resources/mybatis1/sunvote/StudentMapper.xml
src/com/fh/bean/StudentPaper.java
src/com/fh/controller/api/V1.java
src/com/fh/service/sunvote/student/StudentManager.java
src/com/fh/service/sunvote/student/impl/StudentService.java
@@ -133,6 +133,16 @@ WHERE
 	</select>
 	<!-- 通过ID获取数据 -->
+	<select id="findByNumber" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			NUMBER = #{NUMBER}
+	</select>
+	
+	<!-- 通过ID获取数据 -->
 	<select id="countByClassId" parameterType="String" resultType="Integer">
 		select 
 		count(0)
+package com.fh.bean;
+
+import java.util.List;
+
+import com.google.gson.Gson;
+
+public class StudentPaper {
+	
+	public static class StudentAnswer{
+		
+		private Integer score;
+		
+		private String number;
+		
+		private String studentId;
+		
+		private String losttest; 
+		
+		public String getLosttest() {
+			return losttest;
+		}
+
+		public void setLosttest(String losttest) {
+			this.losttest = losttest;
+		}
+
+		private List<Question> questions;
+
+		public Integer getScore() {
+			return score;
+		}
+
+		public void setScore(Integer score) {
+			this.score = score;
+		}
+
+		
+
+		public String getNumber() {
+			return number;
+		}
+
+		public void setNumber(String number) {
+			this.number = number;
+		}
+
+		public String getStudentId() {
+			return studentId;
+		}
+
+		public void setStudentId(String studentId) {
+			this.studentId = studentId;
+		}
+
+		public List<Question> getQuestions() {
+			return questions;
+		}
+
+		public void setQuestions(List<Question> questions) {
+			this.questions = questions;
+		}
+		
+		
+		
+	}
+	
+	public static class Question{
+		private String answer;
+		
+		private String pressTime;
+		
+		private String questionId;
+		
+		private String right;
+		
+		private String score;
+		
+		private String answerType;
+
+		public String getAnswer() {
+			return answer;
+		}
+
+		public void setAnswer(String answer) {
+			this.answer = answer;
+		}
+
+		public String getPressTime() {
+			return pressTime;
+		}
+
+		public void setPressTime(String pressTime) {
+			this.pressTime = pressTime;
+		}
+
+		public String getQuestionId() {
+			return questionId;
+		}
+
+		public void setQuestionId(String questionId) {
+			this.questionId = questionId;
+		}
+
+		public String getRight() {
+			return right;
+		}
+
+		public void setRight(String right) {
+			this.right = right;
+		}
+
+		public String getScore() {
+			return score;
+		}
+
+		public void setScore(String score) {
+			this.score = score;
+		}
+
+		public String getAnswerType() {
+			return answerType;
+		}
+
+		public void setAnswerType(String answerType) {
+			this.answerType = answerType;
+		}
+		
+		
+	}
+	
+	private String createDate;
+	
+	private String endDate;
+	
+	private String schoolId;
+	
+	private String paperId;
+	
+	
+	
+	private List<StudentAnswer> students;
+
+	public String getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getSchoolId() {
+		return schoolId;
+	}
+
+	public void setSchoolId(String schoolId) {
+		this.schoolId = schoolId;
+	}
+
+	public List<StudentAnswer> getStudents() {
+		return students;
+	}
+
+	public void setStudents(List<StudentAnswer> students) {
+		this.students = students;
+	}
+	
+	
+	
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
+	
+	
+	public static StudentPaper parse(String json){
+		Gson gson = new Gson();
+		return gson.fromJson(json, StudentPaper.class);
+	}
+	
+
+	public String toJson(){
+		Gson gson = new Gson();
+		return gson.toJson(this);
+	}
+
+}
@@ -29,6 +29,7 @@ import com.fh.bean.Question;
 import com.fh.bean.ResultHomework;
 import com.fh.bean.ResultHomework.ResultStudent;
 import com.fh.bean.StudentAnswer;
+import com.fh.bean.StudentPaper;
 import com.fh.bean.TestPaper;
 import com.fh.bean.TestPaperInfo;
 import com.fh.controller.base.BaseController;
@@ -98,7 +99,7 @@ public class V1 extends BaseController {
 	private ClassRosterManager classrosterService;
 	@Resource(name = "classtypeService")
-	private ClassTypeManager classtypeService; 
+	private ClassTypeManager classtypeService;
 	@Resource(name = "gradeService")
 	private GradeManager gradeService;
@@ -141,10 +142,10 @@ public class V1 extends BaseController {
 	@Resource(name = "sclassService")
 	private SClassManager sclassService;
-	
-	@Resource(name="homeworkService")
+
+	@Resource(name = "homeworkService")
 	private HomeworkManager homeworkService;
-	
+
 	@Resource(name = "studentService")
 	private StudentManager studentService;
@@ -153,8 +154,8 @@ public class V1 extends BaseController {
 	@Resource(name = "teacherService")
 	private TeacherManager teacherService;
-	
-	@Resource(name="headmasterService")
+
+	@Resource(name = "headmasterService")
 	private HeadmasterManager headmasterService;
 	@Resource(name = "testpaperinfoService")
@@ -198,13 +199,13 @@ public class V1 extends BaseController {
 	@Resource(name = "cacheService")
 	private CacheManager cacheService;
-	
-	@Resource(name="homeworkproblemService")
+
+	@Resource(name = "homeworkproblemService")
 	private HomeworkProblemManager homeworkproblemService;
-	
-	@Resource(name="homeworkReporService")
+
+	@Resource(name = "homeworkReporService")
 	private HomeworkReportManager homeworkReporkService;
-	
+
 	/**
 	 * 登录 可以通过账号密码登录、 可以通过教师卡登录
 	 * 
@@ -236,15 +237,16 @@ public class V1 extends BaseController {
 			}
 			eventPd.put("EVENT_IP", getRemoteIp());
 			eventService.save(eventPd);
-			
+
 			PageData pageData = teacherService.getUserInfo(pd);
-			if(pageData == null){
+			if (pageData == null) {
 				pd.put("PASSWORD",
 						new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
 								.getString("PASSWORD")).toString());
 				pageData = teacherService.getUserInfo(pd);
 			}
-			PageData headerMaster = headmasterService.findByUsenameAndPassword(pd);
+			PageData headerMaster = headmasterService
+					.findByUsenameAndPassword(pd);
 			if (pageData != null && pageData.getString("ID") != null) {
 				pageData.put("PASSWORD", "");// 返回参数中不返回密码
 				PageData pt = new PageData();
@@ -262,14 +264,15 @@ public class V1 extends BaseController {
 				pageData.remove("SUBJECT_IDS");
-				
 				pageData.put("role", "teacher");
 				res.setData(pageData);
 				// 填充数据到返回数据中
-			} else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){
+			} else if (headerMaster != null
+					&& headerMaster.get("HEADMASTER_ID") != null) {
 				headerMaster.put("role", "headermaster");
-				List<PageData> classInfoList = sclassService.listAll(headerMaster);
-				for(PageData pttd : classInfoList){
+				List<PageData> classInfoList = sclassService
+						.listAll(headerMaster);
+				for (PageData pttd : classInfoList) {
 					pttd.put("CLASS_ID", pttd.get("ID"));
 					pttd.remove("ID");
 					pttd.remove("HEADMASTER_ID");
@@ -280,8 +283,8 @@ public class V1 extends BaseController {
 				headerMaster.remove("USERNAME");
 				headerMaster.remove("PASSWORD");
 				res.setData(headerMaster);
-				
-			}else{
+
+			} else {
 				res.set1Error();
 			}
 		} else {
@@ -549,13 +552,13 @@ public class V1 extends BaseController {
 				pd.put("CURRENTPAGE", "" + currentPage);
 			}
 			PageData p = teacherService.findById2(pd.get("USER_ID").toString());
-			if(p != null){
+			if (p != null) {
 				pd.put("SCHOOL_ID", p.get("SCHOOL_ID"));
-				//pd.remove("USER_ID");
-			}else{
+				// pd.remove("USER_ID");
+			} else {
 				pd.put("SCHOOL_ID", "");
 			}
-			if(pd.getString("PAPER_TYPE").equals("2")){
+			if (pd.getString("PAPER_TYPE").equals("2")) {
 				pd.remove("USER_ID");
 			}
 			List<PageData> pageList = paperService.listAllByType(pd);
@@ -610,7 +613,8 @@ public class V1 extends BaseController {
 							question.setKnowledge_id(qpd
 									.getString("KNOWLEDGE_ID"));
 							String ttcontent = qpd.getString("CONTENT");
-							ttcontent = ttcontent.replaceAll("<fill></fill>", "______");
+							ttcontent = ttcontent.replaceAll("<fill></fill>",
+									"______");
 							question.setContent(ttcontent);
 							question.setOption_num(qpd.getString("OPTION_NUM"));
 							question.setOption_content(qpd
@@ -642,7 +646,9 @@ public class V1 extends BaseController {
 											.getString("PROBLEM_TYPE_ID"));
 									qq.setKnowledge_id(q
 											.getString("KNOWLEDGE_ID"));
-									qq.setContent(q.getString("CONTENT").replaceAll("<fill></fill>", "______"));
+									qq.setContent(q.getString("CONTENT")
+											.replaceAll("<fill></fill>",
+													"______"));
 									qq.setOption_num(q.getString("OPTION_NUM"));
 									qq.setOption_content(q
 											.getString("OPTION_CONTENT"));
@@ -815,7 +821,6 @@ public class V1 extends BaseController {
 				+ (System.currentTimeMillis() - cur));
 		return res.toJson();
 	}
-	
 	/**
 	 * 试卷详细信息
@@ -1285,7 +1290,8 @@ public class V1 extends BaseController {
 			paperPd.put("PAPER_STATE", "0");
 			paperPd.put("REMARK", "");
 			String schoolID = Myelfun.getUserID(paper.getUser_id());
-			paperPd.put("SCHOOL_ID", paper.getSchool_id() == null ? schoolID:paper.getSchool_id());
+			paperPd.put("SCHOOL_ID", paper.getSchool_id() == null ? schoolID
+					: paper.getSchool_id());
 			paperPd.put("CREATE_DATE", Tools.date2Str(new Date()));
 			paperPd.put("MODIFY_DATE", Tools.date2Str(new Date()));
@@ -1595,7 +1601,7 @@ public class V1 extends BaseController {
 							}
 						}
-						if(testInfoPdList != null && testInfoPdList.size() > 0){
+						if (testInfoPdList != null && testInfoPdList.size() > 0) {
 							testpaperinfoService.batchSave(testInfoPdList);
 						}
 					}
@@ -1684,7 +1690,7 @@ public class V1 extends BaseController {
 							studentPageData.put("CLASS_ID",
 									testPaper.getClassId());
 							studentPageData.put("STUDENTTEST_ID", get32UUID());
-							
+
 							String flag = "";
 							for (TestPaperInfo testPaperInfo : studentAnswer
 									.getQuestions()) {
@@ -1700,7 +1706,9 @@ public class V1 extends BaseController {
 										testPaperInfo.getQuestionId());
 								testInfoPd.put("ANSWER",
 										testPaperInfo.getAnswer());
-								flag = testPaperInfo.getAnswer().toString().equals("")?""+flag:testPaperInfo.getAnswer().toString();
+								flag = testPaperInfo.getAnswer().toString()
+										.equals("") ? "" + flag : testPaperInfo
+										.getAnswer().toString();
 								testInfoPd.put("RIGHT",
 										testPaperInfo.getRight());
 								testInfoPd.put("SCORE",
@@ -1721,14 +1729,14 @@ public class V1 extends BaseController {
 										testPaperInfo.getMarkNo());
 								testInfoPdList.add(testInfoPd);
 							}
-							
-							if(flag.equals("")){
-								studentPageData.put("LOST_TEST","1");
+
+							if (flag.equals("")) {
+								studentPageData.put("LOST_TEST", "1");
 							}
 							studenttestService.save(studentPageData);
 						}
 					}
-					if(testInfoPdList != null && testInfoPdList.size() > 0){
+					if (testInfoPdList != null && testInfoPdList.size() > 0) {
 						testpaperinfoService.batchSave(testInfoPdList);
 					}
 				}
@@ -1749,6 +1757,90 @@ public class V1 extends BaseController {
 	}
 	/**
+	 * 上传学生测验成绩
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadstudenttest", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object uploadstudenttest() {
+		event("uploadupdateTestpaper");
+		long cur = System.currentTimeMillis();
+		PageData pd = this.getPageData();
+		ResponseGson<String> res = new ResponseGson();
+		if (!StringUtils.isEmpty(pd.getJsonString())) {
+			logger.info(pd.getJsonString());
+			StudentPaper studentPaper = StudentPaper.parse(pd.getJsonString());
+			List<StudentPaper.StudentAnswer> list = studentPaper.getStudents();
+			try {
+				for (StudentPaper.StudentAnswer studentAnswer : list) {
+					PageData testPd = new PageData();
+					String testPaperId = this.get32UUID();
+					testPd.put("STUDENTTEST_ID", testPaperId);
+					String studentId = studentAnswer.getStudentId();
+					String classId = "";
+					// 通过学号id 查找学生信息
+					if (StringUtils.isEmpty(studentId)) {
+						PageData ptd = new PageData();
+						ptd.put("NUMBER", studentAnswer.getNumber());
+						PageData stPd = studentService.findByNumber(ptd);
+						if (stPd != null) {
+							studentId = stPd.getString("ID");
+							classId = stPd.getString("CLASS_ID");
+						}
+					} else {
+						PageData ptd = new PageData();
+						ptd.put("ID", studentAnswer.getStudentId());
+						PageData stPd = studentService.findByNumber(ptd);
+						if (stPd != null) {
+							studentId = stPd.getString("ID");
+							classId = stPd.getString("CLASS_ID");
+						}
+					}
+					testPd.put("STUDENT_ID", studentId);
+					testPd.put("CLASS_ID", classId);
+					testPd.put("PAPER_ID", studentPaper.getPaperId());
+					testPd.put("SCORE", studentAnswer.getScore());
+					testPd.put("LOST_TEST", studentAnswer.getLosttest());
+					studenttestService.save(testPd);
+					List<PageData> testInfoPdList = new ArrayList();
+					List<StudentPaper.Question> questions = studentAnswer
+							.getQuestions();
+					for (StudentPaper.Question question : questions) {
+						PageData testInfoPd = new PageData();
+						testInfoPd.put("TESTPAPERINFO_ID", this.get32UUID());
+						testInfoPd.put("PAPER_ID", studentPaper.getPaperId());
+						testInfoPd.put("STUDENT_ID", studentId);
+						testInfoPd.put("QUESTION_ID", question.getQuestionId());
+						testInfoPd.put("ANSWER", question.getAnswer());
+						testInfoPd.put("RIGHT", question.getRight());
+						testInfoPd.put("SCORE", question.getScore());
+						testInfoPd.put("ANSWER_TYPE", question.getAnswerType());
+						testInfoPdList.add(testInfoPd);
+					}
+
+					if (testInfoPdList.size() > 0) {
+						testpaperinfoService.batchSave(testInfoPdList);
+					}
+
+				}
+
+			} catch (Exception e) {
+				e.printStackTrace();
+				res.setError();
+				res.setMessage(e.getMessage());
+			}
+		} else {
+			res.setDataError();
+		}
+		logger.info("uploadupdatetestpaper cost time:"
+				+ (System.currentTimeMillis() - cur));
+
+		return res.toJson();
+
+	}
+
+	/**
 	 * 上传测验成绩
 	 * 
 	 * @return
@@ -1855,7 +1947,7 @@ public class V1 extends BaseController {
 							}
 						}
 					}
-					if(testInfoPdList.size() > 0){
+					if (testInfoPdList.size() > 0) {
 						testpaperinfoService.batchSave(testInfoPdList);
 					}
 				}
@@ -2390,9 +2482,11 @@ public class V1 extends BaseController {
 			} else {
 				pad.put("OPTION_CONTENT", new String[] { optionContent });
 			}
-			
-			if(pad.getString("CONTENT") != null){
-				pad.put("CONTENT", pad.getString("CONTENT").replaceAll("<fill></fill>", "______"));
+
+			if (pad.getString("CONTENT") != null) {
+				pad.put("CONTENT",
+						pad.getString("CONTENT").replaceAll("<fill></fill>",
+								"______"));
 			}
 		}
 		res.setData(list);
@@ -2531,19 +2625,19 @@ public class V1 extends BaseController {
 	 * @param apiName
 	 */
 	private void event(String apiName) {
-//		PageData eventPd = new PageData();
-//		eventPd.put("EVENT_ID", get32UUID());
-//		eventPd.put("EVENT_NAME", apiName);
-//		eventPd.put("EVENT_USER", getUsername());
-//		eventPd.put("EVENT_TYPE", "-1");
-//		eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
-//		eventPd.put("CLIENT_ID", "SERVER");
-//		eventPd.put("EVENT_IP", getRemoteIp());
-//		try {
-//			eventService.save(eventPd);
-//		} catch (Exception e) {
-//
-//		}
+		// PageData eventPd = new PageData();
+		// eventPd.put("EVENT_ID", get32UUID());
+		// eventPd.put("EVENT_NAME", apiName);
+		// eventPd.put("EVENT_USER", getUsername());
+		// eventPd.put("EVENT_TYPE", "-1");
+		// eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
+		// eventPd.put("CLIENT_ID", "SERVER");
+		// eventPd.put("EVENT_IP", getRemoteIp());
+		// try {
+		// eventService.save(eventPd);
+		// } catch (Exception e) {
+		//
+		// }
 	}
 	static int index = 0;
@@ -2862,7 +2956,7 @@ public class V1 extends BaseController {
 		return res.toJson();
 	}
-	
+
 	/**
 	 * 获取作业列表
 	 * 
@@ -2875,15 +2969,15 @@ public class V1 extends BaseController {
 	public String listhomework() throws Exception {
 		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
 		PageData pageData = this.getPageData();
-		if(pageData.get("COMPLETE_DATE") == null){
+		if (pageData.get("COMPLETE_DATE") == null) {
 			pageData.put("COMPLETE_DATE", pageData.get("COMPLETE"));
 		}
 		List<PageData> list = homeworkService.qlistAll(pageData);
 		res.setData(list);
 		return res.toJson();
-		
+
 	}
-	
+
 	/**
 	 * 获取作业详情
 	 * 
@@ -2898,18 +2992,19 @@ public class V1 extends BaseController {
 		PageData pageData = this.getPageData();
 		pageData.put("CODE", pageData.get("HOMEWORK_ID"));
 		List<PageData> list = homeworkproblemService.listProblem(pageData);
-		for(PageData pd : list){
-			if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){
-				List<PageData> childList = homeworkproblemService.listProblem(pd);
+		for (PageData pd : list) {
+			if (pd.get("P_HOMEWORK_PROBLEM_ID") != null) {
+				List<PageData> childList = homeworkproblemService
+						.listProblem(pd);
 				pd.put("PROBLEMS", childList);
 			}
-			
+
 		}
 		res.setData(list);
 		return res.toJson();
-		
+
 	}
-	
+
 	/**
 	 * 获取作业详情
 	 * 
@@ -2921,15 +3016,17 @@ public class V1 extends BaseController {
 	@ResponseBody
 	public String uploadhomework() throws Exception {
 		ResponseGson<String> res = new ResponseGson<String>();
-		
+
 		PageData pd = this.getPageData();
 		if (!StringUtils.isEmpty(pd.getJsonString())) {
-			ResultHomework resultHomework = ResultHomework.parse(pd.getJsonString());
+			ResultHomework resultHomework = ResultHomework.parse(pd
+					.getJsonString());
 			PageData homePd = new PageData();
 			homePd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 			homePd.put("CLASS_ID", resultHomework.getCLASS_ID());
 			homePd.put("GET_SCORE", resultHomework.getGET_SCORE());
-			homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
+			homePd.put("GET_SCORE_PERSENT",
+					resultHomework.getGET_SCORE_PERSENT());
 			homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
 			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
 			homePd.put("GET_MIN_SCORE", resultHomework.getGET_MIN_SCORE());
@@ -2937,12 +3034,13 @@ public class V1 extends BaseController {
 			homePd.put("COMPLETE_PERSENT", resultHomework.getCOMPLETE_PERSENT());
 			homePd.put("COMPLETE_COUNT", "1");
 			homeworkService.edit(homePd);
-			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
-			if(list == null || list.size() == 0){
+			List<PageData> list = homeworkReporkService
+					.findByHomeworkID(homePd);
+			if (list == null || list.size() == 0) {
 				// 初始化班級作业数据
 				// 1. 根据班级id 查询班级学生列表
 				List<PageData> student = studentService.findByClassId(homePd);
-				for(PageData ptd : student){
+				for (PageData ptd : student) {
 					ptd.put("STUDENT_ID", ptd.get("ID"));
 					ptd.put("STUDENT_NAME", ptd.get("NAME"));
 					ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
@@ -2957,12 +3055,12 @@ public class V1 extends BaseController {
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
 				// 2. 根据学生列表生成初始化成绩
-				if(student.size() > 0){
+				if (student.size() > 0) {
 					homeworkReporkService.batchSave(student);
 				}
 			}
 			List<ResultStudent> students = resultHomework.getSTUDENTS();
-			for(ResultStudent student:students){
+			for (ResultStudent student : students) {
 				// update 学生作业情况
 				PageData tpd = new PageData();
 				tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
@@ -2978,15 +3076,14 @@ public class V1 extends BaseController {
 				homeworkReporkService.update(tpd);
 			}
 			res.setData(resultHomework.getHOMEWORK_ID());
-		}else{
+		} else {
 			res.setDataError();
 		}
-		
+
 		return res.toJson();
-		
+
 	}
-	
-	
+
 	/**
 	 * 更新学生详情
 	 * 
@@ -2998,24 +3095,27 @@ public class V1 extends BaseController {
 	@ResponseBody
 	public String uploadshomework() throws Exception {
 		ResponseGson<String> res = new ResponseGson<String>();
-		
+
 		PageData pd = this.getPageData();
 		if (!StringUtils.isEmpty(pd.getJsonString())) {
-			ResultHomework resultHomework = ResultHomework.parse(pd.getJsonString());
+			ResultHomework resultHomework = ResultHomework.parse(pd
+					.getJsonString());
 			PageData homePd = new PageData();
 			homePd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 			homePd.put("CLASS_ID", resultHomework.getCLASS_ID());
 			homePd.put("GET_SCORE", resultHomework.getGET_SCORE());
-			homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
+			homePd.put("GET_SCORE_PERSENT",
+					resultHomework.getGET_SCORE_PERSENT());
 			homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
 			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
 			homeworkService.edit(homePd);
-			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
-			if(list == null || list.size() == 0){
+			List<PageData> list = homeworkReporkService
+					.findByHomeworkID(homePd);
+			if (list == null || list.size() == 0) {
 				// 初始化班級作业数据
 				// 1. 根据班级id 查询班级学生列表
 				List<PageData> student = studentService.findByClassId(homePd);
-				for(PageData ptd : student){
+				for (PageData ptd : student) {
 					ptd.put("STUDENT_NAME", ptd.get("NAME"));
 					ptd.put("STUDENT_NO", ptd.get("SNO"));
 					ptd.put("RANK", student.size() + "");
@@ -3026,12 +3126,12 @@ public class V1 extends BaseController {
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
 				// 2. 根据学生列表生成初始化成绩
-				if(student != null && student.size() > 0){
+				if (student != null && student.size() > 0) {
 					homeworkReporkService.batchSave(student);
 				}
 			}
 			List<ResultStudent> students = resultHomework.getSTUDENTS();
-			for(ResultStudent student:students){
+			for (ResultStudent student : students) {
 				// update 学生作业情况
 				PageData tpd = new PageData();
 				tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
@@ -3045,12 +3145,12 @@ public class V1 extends BaseController {
 				homeworkReporkService.update(tpd);
 			}
 			res.setData(resultHomework.getHOMEWORK_ID());
-		}else{
+		} else {
 			res.setDataError();
 		}
-		
+
 		return res.toJson();
-		
+
 	}
 	/**
@@ -3158,7 +3258,7 @@ public class V1 extends BaseController {
 	@RequestMapping(value = "/liuqin", produces = "application/json;charset=UTF-8")
 	@ResponseBody
-	public String dosunvotedata() /*throws Exception*/ {
+	public String dosunvotedata() /* throws Exception */{
 		PageData pd = new PageData();
 		pd.put("dbtype", "mysql");
@@ -3169,7 +3269,7 @@ public class V1 extends BaseController {
 		pd.put("databaseName", "sunvote");
 		pd.put("dbport", "3306");
 		List<PageData> resultList = new ArrayList<PageData>();
-		
+
 		try {
 			Connection conn = DbFH.getFHCon(pd);
@@ -3232,7 +3332,7 @@ public class V1 extends BaseController {
 					detailPd.put("NAME", rs1.getString("studentName"));
 					detailPd.put("answerStr", rs1.getString("answerStr"));
 					detailPd.put("SCORE", rs1.getString("totalScore"));
-					detailPd.put("totalScore",  rs.getString("paperScore"));
+					detailPd.put("totalScore", rs.getString("paperScore"));
 					detailList.add(detailPd);
 				}
 				rs1.close();
@@ -3245,7 +3345,7 @@ public class V1 extends BaseController {
 			rs.close();
 			stmt.close();
 			conn.close();
-		}catch(Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		for (PageData paper : resultList) {
@@ -3285,8 +3385,9 @@ public class V1 extends BaseController {
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-				logger.info("添加测试名称成功：" +  paper.get("TESTPAPER_ID"));
-				List<PageData> detailList = (List<PageData>) paper.get("STUDENT");
+				logger.info("添加测试名称成功：" + paper.get("TESTPAPER_ID"));
+				List<PageData> detailList = (List<PageData>) paper
+						.get("STUDENT");
 				int i = 0;
 				List<PageData> testInfoPdList = new ArrayList();
 				for (PageData student : detailList) {
@@ -3311,7 +3412,7 @@ public class V1 extends BaseController {
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-					logger.info("添加学生测试成功：" +  studentDetail.get("NAME"));
+					logger.info("添加学生测试成功：" + studentDetail.get("NAME"));
 					String answerStr = student.getString("answerStr");
 					String[] answerStrs = answerStr.split(";");
@@ -3323,7 +3424,8 @@ public class V1 extends BaseController {
 						testInfoPd.put("PAPER_ID", paper.get("TESTPAPER_ID"));
 						testInfoPd.put("STUDENT_ID", studentDetail.get("ID"));
 						testInfoPd.put("TEST_ID", paper.get("TESTPAPER_ID"));
-						testInfoPd.put("QUESTION_ID", paper.get("TESTPAPER_ID") + "" + i);
+						testInfoPd.put("QUESTION_ID", paper.get("TESTPAPER_ID")
+								+ "" + i);
 						String[] ans = answers.split(",");
 						testInfoPd.put("ANSWER", ans[0]);
 						testInfoPd.put("RIGHT", ans[1]);
@@ -3345,20 +3447,20 @@ public class V1 extends BaseController {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
 						}
-//						testInfoPdList.add(testInfoPd);
+						// testInfoPdList.add(testInfoPd);
 					}
-//					logger.info("学生详细测试数据");
-//					logger.info(testInfoPdList);
+					// logger.info("学生详细测试数据");
+					// logger.info(testInfoPdList);
 					try {
-//						testpaperinfoService.batchSave(testInfoPdList);
+						// testpaperinfoService.batchSave(testInfoPdList);
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-//					logger.info("添加学生详细情况成功：");
+					// logger.info("添加学生详细情况成功：");
 				}
 			}
 		}
-		
+
 		ResponseGson<String> res = new ResponseGson<String>();
 		return res.toJson();
 	}
@@ -95,5 +95,14 @@ public interface StudentManager{
 	 */
 	public List<PageData> listAllClassByTerm(PageData pd)throws Exception;
+	
+	/**
+	 * 
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public PageData findByNumber(PageData pd)throws Exception;
+	
 }
@@ -116,6 +116,14 @@ public class StudentService implements StudentManager{
 		return (PageData)dao.findForObject("StudentMapper.findByName", pd);
 	}
+	/**通过学号获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByNumber(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("StudentMapper.findByNumber", pd);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception