修改课后练bug

孙向锦
1 parent b3c44d84
Showing 9 changed files with 102 additions and 36 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/HomeworkMapper.xml
resources/mybatis1/sunvote/HomeworkReportMapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -64,8 +64,8 @@
 						<th class="center"><div style="width:109px;">键盘</div></th>
 						<th class="center"><div style="width:80px;">正确率</div></th>
 						<th class="center"><div style="width:80px;">得分</div></th>						
-						<c:set value="${ fn:split(pd.DATA[0].ANSWER, ';') }" var="ANSWER" />
-						<c:forEach items="${ANSWER}" var="var" varStatus="vs">
+						<c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
+						<c:forEach items="${AN}" var="var" varStatus="vs">
 							<th class="center th_w"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
 						</c:forEach>
@@ -84,9 +84,10 @@
 									<td class="center"><div style="width:80px;">${var.KEYPAD_ID}</div></td>
 									<td class="center"><div style="width:109px;"><fmt:formatNumber type="number" value="${pd.DATA[vs.index].STUDENT_SCORE/pd.DATA[vs.index].PAPER_SCORE*100}" pattern="0.00"/>%</div></td>
 									<td class="center"><div style="width:80px;">${pd.DATA[vs.index].STUDENT_SCORE}</div></td>
-									
-									<c:forEach items="${ANSWER}" var="var1" varStatus="vs1">
-										<c:set value="${ fn:split(ANSWER[vs1.index], ',') }" var="ANSWER1" />
+									<c:set value="${ fn:split(pd.DATA[vs.index].ANSWER, ';') }" var="ANSWER2" />
+									<c:set value="${ fn:split(pd.HOMEWORKINFO.ANSWER_PERSENT, ',') }" var="AN" />
+									<c:forEach items="${AN}" var="var1" varStatus="vs1">
+										<c:set value="${ fn:split(ANSWER2[vs1.index], ',') }" var="ANSWER1" />
 										<td class="center td_w" <c:if test="${ANSWER1[1]== '1'}">style="background:#0bb8b9"</c:if>><div style="width:80px;margin:0 auto;">${ANSWER1[0]==""?"--":ANSWER1[0]}</div></td>
 									</c:forEach>
@@ -120,7 +120,7 @@
 				</tbody>
 			</table>
 			<div class="footer">
-				<div class="creat">
+				<div class="creat" <c:if test="${pd.SCHOOL_ID != ''  and pd.SCHOOL_ID != null}">style="display:none;"</c:if>>
 					<input type="button"  onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
 				</div>
 				<div class="removeAll">
@@ -138,7 +138,7 @@
 						</div>
 						<hr />
 						<div>
-							<div style="text-align: center;" colspan="10">
+							<div style="text-align: center;display:none" colspan="10">
 								<a class="btn btn-mini btn-danger" onclick="back();">退出</a>
@@ -48,11 +48,13 @@
 				</div>
 				<div class="name">
 					<p>Welcome！</p>
-					<p id="name">${pd.TEACHER[0].TEACHER_NAME }</p>
-					<p id="school">${pd.TEACHER[0].SCHOOL_NAME }</p>
+					<p id="name">${pd.TEACHER.TNAME }</p>
+					<p id="school">${pd.TEACHER.SNAME }</p>
 				</div>
 			</div>
-			<div class="class tab1">
+			<br /> <br /> <br />
+			
+			<%-- <div class="class tab1">
 				<p>
 					Classes<span class="right jiao"></span>
 				</p>
@@ -61,49 +63,51 @@
 						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.CLASS_NAME}
 								<span>${var.SUBJECT_ENAME}</span></p>
 						</li>
-			</c:forEach>
+				</c:forEach>
 			</ul>
-		</div>
+		</div> --%>
 		<div class="testpaper tab1">
-			<p>Test Papers<span class="right jiao"></span></p>
+			<p>E-Test<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p id="qingsongkao_paper">E-exam Papers</p>
+						<p id="qingsongkao_paper">Papers</p>
 						<!-- <ul class="menu_2">
 							<li><p>高一数学 202班</p></li>
 							<li><p>高一数学 203班</p></li>
 						</ul> -->
 					</li>
-					<li>
-						<p id="jishice_paper">E-class Papers</p>
-						
-						<!-- <ul class="menu_2">
-							<li><p>高一数学 202班</p></li>
-							<li><p>高一数学 203班</p></li>
-						</ul> -->
+					<li >
+						<p>Tests</p>
+						<ul class="menu_2">
+							<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
+								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}
+										</p></li>
+							</c:forEach>
+						</ul>
 					</li>
+					
 				</ul>
 		</div>
 		<div class="analyse tab1">
 			<p>
-				Result Analysis<span class="right jiao"></span>
+				E-class<span class="right jiao"></span>
 			</p>
 			<ul class="menu_1">
-					<li >
-						<p>E-exam Tests</p>
-						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
-						</c:forEach>
-						</ul>
+					<li>
+						<p id="jishice_paper">Papers</p>
+						
+						<!-- <ul class="menu_2">
+							<li><p>高一数学 202班</p></li>
+							<li><p>高一数学 203班</p></li>
+						</ul> -->
 					</li>
 					<li>
-						<p>E-class Tests</p>
+						<p>Tests</p>
 						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
+						<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
 							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
 						</c:forEach>
 						</ul>
@@ -298,7 +298,6 @@
 			(sv_student.NUMBER * 1),
 			sv_studenttest.STUDENT_ID,
 			sv_testpaper.CREATE_DATE
-			limit 0,20
 	</select>
@@ -266,6 +266,10 @@
 			ALL_SCORE,	
 			QUESTION_COUNT,	
 			COMPLETE_DESC,
+			ANSWER_PERSENT,
+			GET_MAX_SCORE,
+			GET_SCORE,
+			GET_SCORE_PERSENT,
 			HOMEWORK_ID
 		from 
 		<include refid="tableName"></include>
@@ -12,6 +12,7 @@
 		HOMEWORK_REPORT_ID,	
 		RANK,	
 		STUDENT_NAME,	
+		STUDENT_ID,	
 		STUDNET_NO,	
 		KEYBOARD,	
 		RIGHT_PERSENT,	
@@ -26,6 +27,7 @@
 		#{HOMEWORK_REPORT_ID},	
 		#{RANK},	
 		#{STUDENT_NAME},	
+		#{STUDENT_ID},	
 		#{STUDNET_NO},	
 		#{KEYBOARD},	
 		#{RIGHT_PERSENT},	
@@ -61,6 +63,7 @@
 		set 
 		RANK = #{RANK},
 		STUDENT_NAME = #{STUDENT_NAME},
+		STUDENT_ID = #{STUDENT_ID},
 		STUDNET_NO = #{STUDNET_NO},
 		KEYBOARD = #{KEYBOARD},
 		RIGHT_PERSENT = #{RIGHT_PERSENT},
@@ -78,6 +81,7 @@
 		set 
 		RANK = #{RANK},
 		STUDENT_NAME = #{STUDENT_NAME},
+		STUDENT_ID = #{STUDENT_ID},
 		STUDNET_NO = #{STUDNET_NO},
 		KEYBOARD = #{KEYBOARD},
 		RIGHT_PERSENT = #{RIGHT_PERSENT},
@@ -85,9 +89,9 @@
 		ANSWER = #{ANSWER},
 		HOMEWORK_ID = #{HOMEWORK_ID}
 		where 
+		STUDENT_ID = #{STUDENT_ID}
+		and 
 		HOMEWORK_ID = #{HOMEWORK_ID}
-		and
-		STUDNET_NO = #{STUDNET_NO}
 	</update>
 	<!-- 通过ID获取数据 -->
@@ -164,13 +168,14 @@
       	#{item.HOMEWORK_REPORT_ID},	
 		#{item.RANK},	
 		#{item.STUDENT_NAME},	
+		#{item.STUDENT_ID},	
 		#{item.STUDNET_NO},	
 		#{item.KEYBOARD},	
 		#{item.RIGHT_PERSENT},	
 		#{item.GET_SCORE},	
 		#{item.ANSWER},	
+		#{item.COMPLETE_COUNT},	
 		#{item.HOMEWORK_ID}
-		#{item.COMPLETE_COUNT}
        )
      </foreach>
      </insert>
@@ -2908,9 +2908,10 @@ public class V1 extends BaseController {
 				// 1. 根据班级id 查询班级学生列表
 				List<PageData> student = studentService.findByClassId(homePd);
 				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());
-					ptd.put("STUDENT_NO", ptd.get("SNO"));
+					ptd.put("STUDENT_NO", ptd.get("NUMBER"));
 					ptd.put("RANK", student.size() + "");
 					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
 					ptd.put("RIGHT_PERSENT", "0%");
@@ -5,6 +5,8 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -369,6 +371,7 @@ public class HomeworkController extends BaseController {
 				stuPd.put("STUDENT_ID", stuPd.get("ID"));
 				stuPd.remove("ID");
 			}
+			
 			for (PageData hpd : homeworkList) {
 				hpd.remove("QUESTION_COUNT");
 				hpd.remove("COMPLETE_COUNT");
@@ -504,6 +507,55 @@ public class HomeworkController extends BaseController {
 		}
 		if(pd.get("HOMEWORK_ID") != null){
 			List<PageData> dataList = homeworkService.report(pd);
+			Collections.sort(dataList,new Comparator<PageData>(){
+
+				@Override
+				public int compare(PageData o1, PageData o2) {
+					String o1GetScore = o1.getString("STUDENT_SCORE");
+					String o2GetScore = o2.getString("STUDENT_SCORE");
+					float o1score = 0 ;
+					float o2score = 0 ;
+					try{
+						o1score = Float.parseFloat(o1GetScore);
+					}catch(Exception e){
+						o1score = -1 ;
+					}
+					try{
+						o2score = Float.parseFloat(o2GetScore);
+					}catch(Exception e){
+						o2score = -1 ;
+					}
+					return  o1score - o2score > 0 ? -1 : 1;
+				}
+				
+			});
+			for(int i = 0 ; i < dataList.size(); i++){
+				PageData tpd1 = dataList.get(i);
+				if(i == 0){
+					tpd1.put("RANK", (i+1));
+				}else{
+					PageData tpd2 = dataList.get(i-1);
+					String o1GetScore = tpd1.getString("STUDENT_SCORE");
+					String o2GetScore = tpd2.getString("STUDENT_SCORE");
+					float o1score = 0 ;
+					float o2score = 0 ;
+					try{
+						o1score = Float.parseFloat(o1GetScore);
+					}catch(Exception e){
+						o1score = -1 ;
+					}
+					try{
+						o2score = Float.parseFloat(o2GetScore);
+					}catch(Exception e){
+						o2score = -1 ;
+					}
+					if(o2score - o1score == 0){
+						tpd1.put("RANK",tpd2.get("RANK"));
+					}else{
+						tpd1.put("RANK", (i+1));
+					}
+				}
+			}
 			pd.put("DATA", dataList);
 		}
 		if(pd.get("CLASS_ID") != null){