|
@@ -9,6 +9,9 @@ import java.util.Set;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import cn.com.qmth.stmms.biz.config.service.impl.SystemCache;
|
|
|
+import cn.com.qmth.stmms.biz.school.model.School;
|
|
|
+import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -62,13 +65,18 @@ public class ImportQueryController extends BaseExamController {
|
|
|
@Autowired
|
|
|
private FileService fileService;
|
|
|
|
|
|
-
|
|
|
@Autowired
|
|
|
private TaskService taskService;
|
|
|
|
|
|
@Autowired
|
|
|
private ExamService examService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SystemCache systemCache;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private SchoolService schoolService;
|
|
|
+
|
|
|
public static final String DB_ITEM_JOINER = ":";
|
|
|
|
|
|
public static final String UN_SELECTIVE_SCORE = "-1";
|
|
@@ -84,8 +92,8 @@ public class ImportQueryController extends BaseExamController {
|
|
|
}
|
|
|
model.addAttribute("inspectCount", inspectCount);
|
|
|
if (inspectCount > 0) {
|
|
|
- List<?> ids = PageUtil
|
|
|
- .startPage(importQuery.getStudentIdList(), query.getPageNumber(), query.getPageSize());
|
|
|
+ List<?> ids = PageUtil.startPage(importQuery.getStudentIdList(), query.getPageNumber(),
|
|
|
+ query.getPageSize());
|
|
|
List<ExamStudent> list = new ArrayList<ExamStudent>();
|
|
|
if (ids != null) {
|
|
|
for (Object id : ids) {
|
|
@@ -94,14 +102,14 @@ public class ImportQueryController extends BaseExamController {
|
|
|
student.setTagValue("1");
|
|
|
}
|
|
|
if (student.getSubjectiveScoreList() != null) {
|
|
|
- student.setSubjectiveScoreList(student.getSubjectiveScoreList()
|
|
|
- .replace(UN_SELECTIVE_SCORE, "/"));
|
|
|
+ student.setSubjectiveScoreList(
|
|
|
+ student.getSubjectiveScoreList().replace(UN_SELECTIVE_SCORE, "/"));
|
|
|
}
|
|
|
list.add(student);
|
|
|
}
|
|
|
}
|
|
|
- query.setTotalPage(PageUtil.pageCount(importQuery.getStudentIdList(), query.getPageNumber(),
|
|
|
- query.getPageSize()));
|
|
|
+ query.setTotalPage(
|
|
|
+ PageUtil.pageCount(importQuery.getStudentIdList(), query.getPageNumber(), query.getPageSize()));
|
|
|
query.setTotalCount(inspectCount);
|
|
|
query.setResult(list);
|
|
|
}
|
|
@@ -141,7 +149,8 @@ public class ImportQueryController extends BaseExamController {
|
|
|
return "redirect:/admin/exam/inspected/list";
|
|
|
}
|
|
|
for (InspectedStudentVO studentVO : list) {
|
|
|
- if (StringUtils.isBlank(studentVO.getStudentCode()) || StringUtils.isBlank(studentVO.getSubjectCode())) {
|
|
|
+ if (StringUtils.isBlank(studentVO.getStudentCode())
|
|
|
+ || StringUtils.isBlank(studentVO.getSubjectCode())) {
|
|
|
continue;
|
|
|
}
|
|
|
List<ExamStudent> studentList = studentService.findByExamIdAndStudentCodeAndSubjectCode(examId,
|
|
@@ -190,7 +199,8 @@ public class ImportQueryController extends BaseExamController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/export")
|
|
|
- public String export(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
|
|
|
+ public String export(HttpServletRequest request, HttpServletResponse response,
|
|
|
+ RedirectAttributes redirectAttributes) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
WebUser wu = RequestUtils.getWebUser(request);
|
|
|
try {
|
|
@@ -228,6 +238,8 @@ public class ImportQueryController extends BaseExamController {
|
|
|
setting.accumulate("examType", exam.getType());
|
|
|
setting.accumulate("inspectCount", inspectCount);
|
|
|
setting.accumulate("fileServer", fileService.getFileServer());
|
|
|
+ School school = schoolService.findById(exam.getSchoolId());
|
|
|
+ setting.accumulate("doubleTrack", systemCache.isDoubleTrack() && school.isDoubleTrack());
|
|
|
setting.accumulate("studentIds", inspectCount > 0 ? studentIds : new ArrayList<Integer>());
|
|
|
setting.accumulate("tagIds", tagIds);
|
|
|
setting.accumulate("message", inspectCount > 0 ? "" : "没有待复核的任务");
|