From 31d7a48c6b03fc3738d87e3c457727a541a1f2ac Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 4 Apr 2019 14:45:27 +0800
Subject: [PATCH] 分数bug修复

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp | 6 +++---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp  | 2 +-
 WebRoot/WEB-INF/tld/elfun.tld                           | 8 ++++++++
 resources/mybatis1/sunvote/HomeworkMapper.xml           | 8 ++++----
 src/com/fh/controller/sunvote/Myelfun.java              | 4 ++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
index c7b6503..9569d6a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -134,15 +134,15 @@
 								<col width="10%"/>
 								<tbody class="subject_body_tbody">
 									<c:choose>
-										<c:when test="${not empty pd.PROBLEMS}">
-											<c:forEach items="${pd.PROBLEMS}" var="var" varStatus="vs">
+										<c:when test="${not empty pd.QUESTIONS}">
+											<c:forEach items="${pd.QUESTIONS}" var="var" varStatus="vs">
 												<tr>
 													<td class="first">${var.RANK}</td>
 													<td class="middle">
 														<div class="question question${var.RANK}">
 															<ul>
 																<c:forEach var="i" begin="1" end="${var.OPTION_NUM}">
-																	<c:set var="a" value="fn:substring('ABCDEFGHI',i-1,i)"/>
+																	<c:set var="a" value="${fn:substring('ABCDEFGHI',i-1,i)}"/>
 																	
 																	<li class="btn btn-default <c:if test="${fn:contains(var.RIGHT_ANSWER, a)}"> on </c:if>">${a}</li>
 																</c:forEach>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index bb185ac..16bf629 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -89,7 +89,7 @@
 								<td ><a  target="_blank" href="<%=basePath%>homework/iteminfo.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.COMPLETE_DATE}</td>
-								<td >${var.QUESTIOM_COUNT}</td>
+								<td >${var.QUESTION_COUNT}</td>
 								<td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td>
 								<td >${var.ALL_SCORE}</td>
 								<td>
diff --git a/WebRoot/WEB-INF/tld/elfun.tld b/WebRoot/WEB-INF/tld/elfun.tld
index 1a047de..b2ac093 100644
--- a/WebRoot/WEB-INF/tld/elfun.tld
+++ b/WebRoot/WEB-INF/tld/elfun.tld
@@ -134,6 +134,14 @@
       <example>${myelfun:findSoftwareName(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
    </function>
    
+   <function>  
+      <description>数字转字符</description><!-- 对该标签的说明 -->  
+      <name>jstlInt2Char</name><!-- 定义标签名，放在短标签之后 -->  
+      <function-class>com.fh.controller.sunvote.Myelfun</function-class><!-- 标签处理域值的类路径  -->  
+      <function-signature>java.lang.String findSoftwareName(int)</function-signature><!-- 标签处理域值的具体的类方法 -->  
+      <example>${myelfun:jstlInt2Char(obj1)}</example><!-- 自定义标签的使用示范 ，域参数会自动传递到具体的方法里面-->  
+   </function>
+   
    
  
 </taglib>
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 009d8c5..83bec9f 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -27,7 +27,7 @@
 		GET_SCORE,	
 		GET_SCORE_PERSENT,	
 		GET_MAX_SCORE,	
-		QUESTIOM_COUNT,	
+		QUESTION_COUNT,	
 		HOMEWORK_ID
 	</sql>
 	
@@ -51,7 +51,7 @@
 		#{GET_SCORE},	
 		#{GET_SCORE_PERSENT},	
 		#{GET_MAX_SCORE},	
-		#{QUESTIOM_COUNT},	
+		#{QUESTION_COUNT},	
 		#{HOMEWORK_ID}
 	</sql>
 	
@@ -115,8 +115,8 @@
 			GET_SCORE_PERSENT = #{GET_SCORE_PERSENT},
 			</if><if test="GET_MAX_SCORE != null and GET_MAX_SCORE != ''">
 			GET_MAX_SCORE = #{GET_MAX_SCORE},
-			</if><if test="QUESTIOM_COUNT != null and QUESTIOM_COUNT != ''">
-			QUESTIOM_COUNT = #{QUESTIOM_COUNT},
+			</if><if test="QUESTION_COUNT != null and QUESTION_COUNT != ''">
+			QUESTION_COUNT = #{QUESTION_COUNT},
 			</if>
 		HOMEWORK_ID = HOMEWORK_ID
 		where 
diff --git a/src/com/fh/controller/sunvote/Myelfun.java b/src/com/fh/controller/sunvote/Myelfun.java
index cf5c9be..3b063f4 100644
--- a/src/com/fh/controller/sunvote/Myelfun.java
+++ b/src/com/fh/controller/sunvote/Myelfun.java
@@ -331,4 +331,8 @@ public class Myelfun {
 			return "" ;
 		}
 	}
+	
+	public static String jstlInt2Char(int i){
+		return "" + ('A' + (i - 1));
+	}
 }
--
libgit2 0.21.4