Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

jack
2 parents aa853175 05f4feee
Showing 4 changed files with 61 additions and 111 deletions
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/service/sunvote/homeworkproblem/HomeworkProblemManager.java
src/com/fh/service/sunvote/homeworkproblem/impl/HomeworkProblemService.java
@@ -94,6 +94,16 @@
 			HOMEWORKPROBLEM_ID = #{HOMEWORKPROBLEM_ID}
 	</select>
+	<select id="findByCodeAndRank" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			CODE = #{CODE},
+			and RANK = #{RANK}
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -44,7 +44,8 @@ import com.fh.util.StringUtil;
 import com.google.gson.Gson;
 /**
- * 说明：作业 创建人：FH Q313596790 创建时间：2019-03-07
+ * 说明：作业 创建人：FH Q313596790 
+ * 创建时间：2019-03-07
  */
 @Controller
 @RequestMapping(value = "/homework")
@@ -321,75 +322,6 @@ public class HomeworkController extends BaseController {
 		return modelAndView;
 	}
-	/**
-	 * 传入homework_id 
-	 * index 第几题
-	 * @return
-	 * @throws Exception
-	 */
-	@RequestMapping(value = "/homeworkindexview")
-	public ModelAndView homeworkindexview() throws Exception {
-		PageData pageData = this.getPageData();
-		ModelAndView modelAndView = getModelAndView();
-		
-		String homeworkId = pageData.getString("HOMEWORK_ID");
-		String index = pageData.getString("INDEX");
-		int indexint = Integer.parseInt(index);
-		List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
-		List<PageData> result = new ArrayList();
-		PageData aresult = new PageData();
-		aresult.put("ANSWER", "A");
-		PageData bresult = new PageData();
-		bresult.put("ANSWER", "B");
-		PageData cresult = new PageData();
-		cresult.put("ANSWER", "C");
-		PageData dresult = new PageData();
-		dresult.put("ANSWER", "D");
-		PageData eresult = new PageData();
-		eresult.put("ANSWER", "");
-		result.add(aresult);
-		result.add(bresult);
-		result.add(cresult);
-		result.add(dresult);
-		result.add(eresult);
-		for(PageData pd : data){
-			String answer = pd.getString("ANSWER");
-			if(!StringUtils.isEmpty(answer)){
-				String[] answers = answer.split(";");
-				if(answers.length >= indexint -1){
-					String ans = answers[indexint - 1];
-					String[] anss = ans.split(":");
-					if(anss != null && anss.length == 2){
-						PageData tresult = null;
-						for(PageData ptd : result){
-							if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
-								tresult = ptd;
-							}
-						}
-						if(tresult == null){
-							tresult = new PageData();
-							result.add(tresult);
-						}
-						List<String> list = (List)tresult.get("STUDENTS");
-						if(list == null){
-							list = new ArrayList();
-						}
-						list.add(pd.getString("STUDENT_NAME"));
-						tresult.put("ANSWER", anss[0].toUpperCase());
-						tresult.put("STUDENTS", list);
-						tresult.put("RIGHT", !"0".equals(anss[1]));
-					}
-				}
-			}
-		}
-		
-		modelAndView.addObject("datas", new Gson().toJson(result));
-//		modelAndView.addObject("datas",result);
-		
-		modelAndView.setViewName("");
-		return modelAndView;
-	}
-	
 	/**
 	 * 传入homework_id 
@@ -406,53 +338,47 @@ public class HomeworkController extends BaseController {
 		String index = pageData.getString("INDEX");
 		int indexint = Integer.parseInt(index);
 		List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
-		List<PageData> result = new ArrayList();
-		PageData aresult = new PageData();
-		aresult.put("ANSWER", "A");
-		PageData bresult = new PageData();
-		bresult.put("ANSWER", "B");
-		PageData cresult = new PageData();
-		cresult.put("ANSWER", "C");
-		PageData dresult = new PageData();
-		dresult.put("ANSWER", "D");
-		PageData eresult = new PageData();
-		eresult.put("ANSWER", "");
-		result.add(aresult);
-		result.add(bresult);
-		result.add(cresult);
-		result.add(dresult);
-		result.add(eresult);
-		for(PageData pd : data){
-			String answer = pd.getString("ANSWER");
-			if(!StringUtils.isEmpty(answer)){
-				String[] answers = answer.split(";");
-				if(answers.length >= indexint -1){
-					String ans = answers[indexint - 1];
-					String[] anss = ans.split(",");
-					if(anss != null && anss.length == 2){
-						PageData tresult = null;
-						for(PageData ptd : result){
-							if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
-								tresult = ptd;
+		pageData = homeworkService.findById(pageData);
+		pageData.put("RANK", indexint);
+		pageData = homeworkproblemService.findByCodeAndRank(pageData);
+		pageData.remove("HOMEWORKPROBLEM_ID");
+		pageData.remove("HOMEWORK_ID");
+		pageData.remove("CODE");
+		pageData.remove("RANK");
+		pageData.remove("NAME");
+		pageData.remove("TYPE");
+		String optionNumStr = pageData.getString("OPTION_NUM");
+		String rightAnswer = pageData.getString("RIGHT_ANSWER");
+		rightAnswer = rightAnswer.toUpperCase();
+		int optionNum = Integer.parseInt(optionNumStr);
+		
+		List<List<String>> resultData = new ArrayList();
+		for (int i = 0; i < optionNum; i++) {
+			List<String> optionAnswer = new ArrayList();
+			resultData.add(optionAnswer);
+			for (PageData pd : data) {
+				String answer = pd.getString("ANSWER");
+				if (!StringUtils.isEmpty(answer)) {
+					String[] answers = answer.split(";");
+					if (answers.length >= indexint - 1) {
+						String ans = answers[indexint - 1];
+						String[] anss = ans.split(",");
+						if (anss != null && anss.length == 2) {
+							char option = (char)('A' + i) ;
+							if(anss[0] != null){
+								if(anss[0].contains("" + option)){
+									optionAnswer.add(pd.getString("STUDENT_NAME"));
+								}
 							}
 						}
-						if(tresult == null){
-							tresult = new PageData();
-							result.add(tresult);
-						}
-						List<String> list = (List)tresult.get("STUDENTS");
-						if(list == null){
-							list = new ArrayList();
-						}
-						list.add(pd.getString("STUDENT_NAME"));
-						tresult.put("ANSWER", anss[0].toUpperCase());
-						tresult.put("STUDENTS", list);
-						tresult.put("RIGHT", !"0".equals(anss[1]));
 					}
 				}
 			}
 		}
-		return new Gson().toJson(result);
+		Map<String,Object> map = new HashMap();
+		map.put("ANSWER", rightAnswer);
+		map.put("DATA", resultData);
+		return new Gson().toJson(map);
 	}
@@ -64,6 +64,12 @@ public interface HomeworkProblemManager{
 	 */
 	public PageData findById(PageData pd)throws Exception;
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCodeAndRank(PageData pd)throws Exception;
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
@@ -90,6 +90,14 @@ public class HomeworkProblemService implements HomeworkProblemManager{
 		return (PageData)dao.findForObject("HomeworkProblemMapper.findById", pd);
 	}
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCodeAndRank(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("HomeworkProblemMapper.findByCodeAndRank", pd);
+	}
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception