修改签到表显示方式

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -22,14 +22,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.stmms.biz.campus.model.Campus;
 import cn.com.qmth.stmms.biz.campus.service.CampusService;
 import cn.com.qmth.stmms.biz.exam.model.Exam;
+import cn.com.qmth.stmms.biz.exam.model.ExamPackage;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.query.ExamStudentSearchQuery;
+import cn.com.qmth.stmms.biz.exam.service.ExamPackageService;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
@@ -42,6 +42,8 @@ import cn.com.qmth.stmms.common.utils.ImportExcel;
 import cn.com.qmth.stmms.common.utils.PictureUrlBuilder;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
+import com.google.common.collect.Lists;
+
 @Controller("examStudentController")
 @RequestMapping("/admin/exam/student")
 public class StudentController extends BaseExamController {
@@ -62,9 +64,15 @@ public class StudentController extends BaseExamController {
 
     @Autowired
     private MarkService markService;
+    
+    @Autowired
+    private ExamPackageService packageService;
 
     @Value("${sheet.image.server}")
     private String imageServer;
+    
+    @Value("${package.image.server}")
+    private String packageServer;
 
     @RequestMapping
     public String list(Model model, HttpServletRequest request, ExamStudentSearchQuery query) {
@@ -80,6 +88,7 @@ public class StudentController extends BaseExamController {
             for (ExamStudent student : query.getResult()) {
                 student.setSubject(subjectService.find(student.getExamId(), student.getSubjectCode()));
                 buildSheetUrl(student);
+                buildPackageUrl(student);
             }
             model.addAttribute("studentList", query.getResult());
         }
@@ -89,6 +98,7 @@ public class StudentController extends BaseExamController {
         model.addAttribute("levelList", subjectService.listLevel(examId));
         model.addAttribute("categoryList", subjectService.listCategory(examId));
         model.addAttribute("imageServer", imageServer);
+        model.addAttribute("packageServer", packageServer);
         return "modules/exam/studentList";
     }
 
@@ -365,4 +375,14 @@ public class StudentController extends BaseExamController {
         student.setSheetUrls(PictureUrlBuilder.getSheetUrls(student.getExamId(), campus.getId(),
                 student.getSubjectCode(), student.getExamNumber(), student.getSheetCount()));
     }
+    
+    private void buildPackageUrl(ExamStudent student) {
+        if (StringUtils.isNotBlank(student.getPackageCode())) {
+            ExamPackage ep = packageService.find(student.getExamId(), student.getPackageCode());
+            if (ep != null && ep.getPicCount() > 0) {
+                student.setPackageUrls(PictureUrlBuilder.getPackageUrls(student.getExamId(), student.getPackageCode(),
+                        ep.getPicCount()));
+            }
+        }
+    }
 }

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -125,7 +125,12 @@
 				</td>
 				<td>${student.batchCode}</td>
 				<td>
-				<a id="packageCode" target="_blank" href="${ctx}/admin/exam/scan/package?code=${student.packageCode}">${student.packageCode}</a>
+				<c:if test="${student.packageUrlString!=null && student.packageUrlString!=''}">
+					<a class="package-link" href="##" data-image-url="${student.packageUrlString}" data-title="${student.packageCode}">${student.packageCode}</a>
+				</c:if>
+				<c:if test="${student.packageUrlString==null || student.packageUrlString==''}">
+					${student.packageCode}
+				</c:if>
 				</td>
 				<td>${student.examSite}&nbsp;${student.examRoom}</td>
 				<td>
@@ -149,6 +154,10 @@ $(document).ready(function() {
     	initSheetPopover($(this).attr('data-title'), '${imageServer}', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
     	return false;
     });
+    $('.package-link').click(function(){
+    	initImagePopover($(this).attr('data-title'), '${packageServer}', $(this).attr('data-image-url'));
+    	return false;
+    });
 });
 
 $('#packageCode').click(function(){