Selaa lähdekoodia

修复标记卷显示问题

ting.yin 6 vuotta sitten
vanhempi
commit
45f1f1ead3

+ 10 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -1,7 +1,9 @@
 package cn.com.qmth.stmms.admin.exam;
 
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.servlet.http.HttpServletRequest;
@@ -135,12 +137,18 @@ public class ScoreController extends BaseExamController {
             }
             List<MarkLibrary> markLibrarys = markLibraryService.findByStudentId(student.getId());
             if(!markLibrarys.isEmpty()){
+            	Set<String> tags = new HashSet<String>();
             	for (MarkLibrary markLibrary : markLibrarys) {
             		if(markLibrary.getTags()!=null){
-            			student.setTagValue(markLibrary.getTags());
-            			break;
+            			String[] tag = markLibrary.getTags().split(",");
+            			for (String s : tag) {
+            				tags.add(s);
+						}
             		}
 				}
+            	if(!tags.isEmpty()){
+            		student.setTagValue(tags.toString());
+            	}
             }
         }
         view.addObject("query", query);

+ 4 - 4
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

@@ -174,16 +174,16 @@
                     </c:if>
                 </td>
 				<td>
-                    <c:if test="${student.tagValue.indexOf('1')>-1}">
+                    <c:if test="${student.tagValue.indexOf('1',0)>-1}">
                         试卷雷同<br>
                     </c:if>
-                    <c:if test="${student.tagValue.indexOf('2')>-1}">
+                    <c:if test="${student.tagValue.indexOf('2',0)>-1}">
                         科目错误<br>
                     </c:if>
-                    <c:if test="${student.tagValue.indexOf('3')>-1}">
+                    <c:if test="${student.tagValue.indexOf('3',0)>-1}">
                         贴错条码<br>
                     </c:if>
-                    <c:if test="${student.tagValue.indexOf('4')>-1}">
+                    <c:if test="${student.tagValue.indexOf('4',0)>-1}">
                         违纪<br>
                     </c:if>
 				</td>