|
@@ -1,29 +1,5 @@
|
|
|
package cn.com.qmth.stmms.admin.exam;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.LinkedList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
-import net.sf.json.JSONObject;
|
|
|
-
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Controller;
|
|
|
-import org.springframework.ui.Model;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
|
-
|
|
|
import cn.com.qmth.stmms.admin.vo.ExamStudentVO;
|
|
|
import cn.com.qmth.stmms.admin.vo.UploadStudentVO;
|
|
|
import cn.com.qmth.stmms.biz.exam.model.Exam;
|
|
@@ -46,8 +22,24 @@ import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
|
|
|
import cn.com.qmth.stmms.common.utils.ExportExcel;
|
|
|
import cn.com.qmth.stmms.common.utils.ImportExcel;
|
|
|
import cn.com.qmth.stmms.common.utils.RequestUtils;
|
|
|
-
|
|
|
import com.google.common.collect.Lists;
|
|
|
+import net.sf.json.JSONObject;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Controller;
|
|
|
+import org.springframework.ui.Model;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
|
+
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Controller("examStudentController")
|
|
|
@RequestMapping("/admin/exam/student")
|
|
@@ -216,11 +208,8 @@ public class StudentController extends BaseExamController {
|
|
|
if (student != null) {
|
|
|
studentService.deleteById(id);
|
|
|
markService.deleteByStudent(student);
|
|
|
- subjectService.updateUploadCount(
|
|
|
- student.getExamId(),
|
|
|
- student.getSubjectCode(),
|
|
|
- (int) studentService.countUploadedByExamIdAndSubjectCode(student.getExamId(),
|
|
|
- student.getSubjectCode()));
|
|
|
+ subjectService.updateUploadCount(student.getExamId(), student.getSubjectCode(), (int) studentService
|
|
|
+ .countUploadedByExamIdAndSubjectCode(student.getExamId(), student.getSubjectCode()));
|
|
|
addMessage(redirectAttributes, "删除考生成功");
|
|
|
RequestUtils.setLog(request, "删除成功,id:" + id);
|
|
|
} else {
|
|
@@ -269,10 +258,10 @@ public class StudentController extends BaseExamController {
|
|
|
|
|
|
for (ExamStudent student : list) {
|
|
|
if (StringUtils.isBlank(student.getExamNumber()) || StringUtils.isBlank(student.getName())
|
|
|
- || StringUtils.isBlank(student.getSubjectCode())
|
|
|
- || StringUtils.isBlank(student.getSubjectName()) || StringUtils.isBlank(student.getCollege())
|
|
|
- || StringUtils.isBlank(student.getClassName()) || StringUtils.isBlank(student.getTeacher())
|
|
|
- || StringUtils.isBlank(student.getStudentCode())) {
|
|
|
+ || StringUtils.isBlank(student.getSubjectCode()) || StringUtils
|
|
|
+ .isBlank(student.getSubjectName()) || StringUtils.isBlank(student.getCollege()) || StringUtils
|
|
|
+ .isBlank(student.getClassName()) || StringUtils.isBlank(student.getTeacher()) || StringUtils
|
|
|
+ .isBlank(student.getStudentCode())) {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -343,7 +332,7 @@ public class StudentController extends BaseExamController {
|
|
|
public Object getSheetTag(HttpServletRequest request, @RequestParam Integer id) {
|
|
|
ExamStudent student = studentService.findById(id);
|
|
|
if (student != null) {
|
|
|
- return studentService.buildSheetTags(student);
|
|
|
+ return studentService.buildSheetTags(student, false);
|
|
|
} else {
|
|
|
return new HashMap<>();
|
|
|
}
|
|
@@ -365,7 +354,8 @@ public class StudentController extends BaseExamController {
|
|
|
|
|
|
@Logging(menu = "导入缺考名单", type = LogType.IMPORT_FILE)
|
|
|
@RequestMapping(value = "/absentImport", method = RequestMethod.POST)
|
|
|
- public String absentImportFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
|
|
|
+ public String absentImportFile(HttpServletRequest request, MultipartFile file,
|
|
|
+ RedirectAttributes redirectAttributes) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
try {
|
|
|
int successNum = 0;
|
|
@@ -417,7 +407,8 @@ public class StudentController extends BaseExamController {
|
|
|
|
|
|
@Logging(menu = "导入违纪名单", type = LogType.IMPORT_FILE)
|
|
|
@RequestMapping(value = "/breachImport", method = RequestMethod.POST)
|
|
|
- public String breachImportFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
|
|
|
+ public String breachImportFile(HttpServletRequest request, MultipartFile file,
|
|
|
+ RedirectAttributes redirectAttributes) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
// Exam exam = examService.findById(examId);
|
|
|
try {
|
|
@@ -492,7 +483,8 @@ public class StudentController extends BaseExamController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/uploadImport", method = RequestMethod.POST)
|
|
|
- public String uploadImportFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
|
|
|
+ public String uploadImportFile(HttpServletRequest request, MultipartFile file,
|
|
|
+ RedirectAttributes redirectAttributes) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
// Exam exam = examService.findById(examId);
|
|
|
try {
|
|
@@ -571,8 +563,8 @@ public class StudentController extends BaseExamController {
|
|
|
}
|
|
|
|
|
|
private void buildSheetUrl(ExamStudent student) {
|
|
|
- student.setSheetUrls(fileService.getSheetUris(student.getExamId(), student.getExamNumber(), 1,
|
|
|
- student.getSheetCount()));
|
|
|
+ student.setSheetUrls(
|
|
|
+ fileService.getSheetUris(student.getExamId(), student.getExamNumber(), 1, student.getSheetCount()));
|
|
|
}
|
|
|
|
|
|
private void buildPackageUrl(ExamStudent student) {
|