|
@@ -8,7 +8,6 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import org.apache.commons.lang.StringEscapeUtils;
|
|
@@ -20,14 +19,11 @@ import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.core.task.AsyncTaskExecutor;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
-import org.springframework.ui.Model;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
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 com.google.common.collect.Lists;
|
|
|
import com.qmth.boot.core.collection.PageResult;
|
|
@@ -58,7 +54,6 @@ import cn.com.qmth.stmms.biz.school.model.School;
|
|
|
import cn.com.qmth.stmms.biz.school.service.SchoolService;
|
|
|
import cn.com.qmth.stmms.biz.user.model.User;
|
|
|
import cn.com.qmth.stmms.biz.user.service.UserService;
|
|
|
-import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
|
|
|
import cn.com.qmth.stmms.biz.utils.PageUtil;
|
|
|
import cn.com.qmth.stmms.common.annotation.Logging;
|
|
|
import cn.com.qmth.stmms.common.annotation.RoleRequire;
|
|
@@ -506,46 +501,45 @@ public class MarkerController extends BaseApiController {
|
|
|
return resultOk();
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * TODO
|
|
|
- *
|
|
|
- * @RequestMapping(value = "/class/{markerId}", method = RequestMethod.GET)
|
|
|
- * public String classList(@PathVariable Integer markerId, Model model,
|
|
|
- * RedirectAttributes redirectAttributes) { Marker marker =
|
|
|
- * markerService.findById(markerId); if (marker != null) {
|
|
|
- * marker.setUser(userService.findById(marker.getUserId()));
|
|
|
- * model.addAttribute("marker", marker); Set<String> classes =
|
|
|
- * classService.findClassNameByUserIdAndExamId(marker.getUserId(),
|
|
|
- * marker.getExamId()); model.addAttribute("classes", classes); return
|
|
|
- * "modules/exam/markerClass"; } addMessage(redirectAttributes, "评卷员不存在");
|
|
|
- * return "redirect:/admin/exam/marker"; }
|
|
|
- *
|
|
|
- * @Logging(menu = "评卷员班级绑定", type = LogType.UPDATE)
|
|
|
- *
|
|
|
- * @RequestMapping(value = "/class/{markerId}", method = RequestMethod.POST)
|
|
|
- * public String classSave(@PathVariable Integer
|
|
|
- * markerId, @RequestParam(required = false) String[] classes, Model model,
|
|
|
- * RedirectAttributes redirectAttributes) { Marker marker =
|
|
|
- * markerService.findById(markerId); if (marker != null) {
|
|
|
- * classService.save(marker.getUserId(), marker.getExamId(), classes);
|
|
|
- * addMessage(redirectAttributes, "保存成功"); return "redirect:" +
|
|
|
- * "/admin/exam/marker?subjectCode=" + marker.getSubjectCode() +
|
|
|
- * "&groupNumber=" + marker.getGroupNumber(); }
|
|
|
- * addMessage(redirectAttributes, "评卷员不存在"); return
|
|
|
- * "redirect:/admin/exam/marker"; }
|
|
|
- *
|
|
|
- * @Logging(menu = "评卷员班级清空", type = LogType.DELETE)
|
|
|
- *
|
|
|
- * @RequestMapping(value = "/class/delete", method = RequestMethod.GET)
|
|
|
- * public String classDelete(@RequestParam Integer markerId, Model model,
|
|
|
- * RedirectAttributes redirectAttributes) { Marker marker =
|
|
|
- * markerService.findById(markerId); if (marker != null) {
|
|
|
- * classService.deleteByUserIdAndExamId(marker.getUserId(),
|
|
|
- * marker.getExamId()); addMessage(redirectAttributes, "清空成功"); return
|
|
|
- * "redirect:" + "/admin/exam/marker?subjectCode=" + marker.getSubjectCode()
|
|
|
- * + "&groupNumber=" + marker.getGroupNumber(); }
|
|
|
- * addMessage(redirectAttributes, "评卷员不存在"); return
|
|
|
- * "redirect:/admin/exam/marker"; }
|
|
|
- */
|
|
|
+ @ApiOperation(value = "评卷员班级名")
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping(value = "class/name", method = RequestMethod.POST)
|
|
|
+ public Set<String> classList(@RequestParam Integer markerId) {
|
|
|
+ Marker marker = markerService.findById(markerId);
|
|
|
+ if (marker != null) {
|
|
|
+ marker.setUser(userService.findById(marker.getUserId()));
|
|
|
+ return classService.findClassNameByUserIdAndExamId(marker.getUserId(), marker.getExamId());
|
|
|
+ } else {
|
|
|
+ throw new StatusException("评卷员不存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "评卷员班级绑定")
|
|
|
+ @Logging(menu = "评卷员班级绑定", type = LogType.UPDATE)
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping(value = "class/add", method = RequestMethod.POST)
|
|
|
+ public ResultMessage classSave(@RequestParam Integer markerId, @RequestParam(required = false) String[] classes) {
|
|
|
+ Marker marker = markerService.findById(markerId);
|
|
|
+ if (marker != null) {
|
|
|
+ classService.save(marker.getUserId(), marker.getExamId(), classes);
|
|
|
+ return resultOk();
|
|
|
+ } else {
|
|
|
+ throw new StatusException("评卷员不存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation(value = "清空班级")
|
|
|
+ @Logging(menu = "评卷员班级清空", type = LogType.DELETE)
|
|
|
+ @ResponseBody
|
|
|
+ @RequestMapping(value = "class/delete", method = RequestMethod.POST)
|
|
|
+ public ResultMessage classDelete(@RequestParam Integer markerId) {
|
|
|
+ Marker marker = markerService.findById(markerId);
|
|
|
+ if (marker != null) {
|
|
|
+ classService.deleteByUserIdAndExamId(marker.getUserId(), marker.getExamId());
|
|
|
+ return resultOk();
|
|
|
+ } else {
|
|
|
+ throw new StatusException("评卷员不存在");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|