|
@@ -28,6 +28,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|
import cn.com.qmth.stmms.admin.dto.MarkerDTO;
|
|
import cn.com.qmth.stmms.admin.dto.MarkerDTO;
|
|
import cn.com.qmth.stmms.admin.dto.SubjectUserDTO;
|
|
import cn.com.qmth.stmms.admin.dto.SubjectUserDTO;
|
|
import cn.com.qmth.stmms.admin.exam.BaseExamController;
|
|
import cn.com.qmth.stmms.admin.exam.BaseExamController;
|
|
|
|
+import cn.com.qmth.stmms.biz.exam.bean.AddStudentInfo;
|
|
import cn.com.qmth.stmms.biz.exam.bean.UserStudentVo;
|
|
import cn.com.qmth.stmms.biz.exam.bean.UserStudentVo;
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
|
|
import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
|
|
@@ -164,7 +165,7 @@ public class UserController extends BaseExamController {
|
|
if (user.getId() != null) {
|
|
if (user.getId() != null) {
|
|
previous = userService.findById(user.getId());
|
|
previous = userService.findById(user.getId());
|
|
}
|
|
}
|
|
- Integer suc=null;
|
|
|
|
|
|
+ AddStudentInfo suc=null;
|
|
if (previous == null) {
|
|
if (previous == null) {
|
|
String message = validate(user, subjectCodeString, examIdString);
|
|
String message = validate(user, subjectCodeString, examIdString);
|
|
if (message == null) {
|
|
if (message == null) {
|
|
@@ -276,13 +277,13 @@ public class UserController extends BaseExamController {
|
|
String role = queryRole == null ? "" : String.valueOf(queryRole.getValue());
|
|
String role = queryRole == null ? "" : String.valueOf(queryRole.getValue());
|
|
String source = querySource == null ? "" : String.valueOf(querySource.getValue());
|
|
String source = querySource == null ? "" : String.valueOf(querySource.getValue());
|
|
if(suc!=null) {
|
|
if(suc!=null) {
|
|
- addMessage(redirectAttributes, "成功绑定考生"+suc+"条");
|
|
|
|
|
|
+ addMessage(redirectAttributes, "成功绑定考生"+suc.getSuccess()+"条,失败"+suc.getFailed()+"条(已绑定或无效的准考证号)");
|
|
}
|
|
}
|
|
return "redirect:/admin/user/list?pageNumber=" + pageNumber + "&source=" + source + "&role=" + role
|
|
return "redirect:/admin/user/list?pageNumber=" + pageNumber + "&source=" + source + "&role=" + role
|
|
+ "&loginName=" + queryLoginName + "&name=" + queryName + "&enable=" + enable;
|
|
+ "&loginName=" + queryLoginName + "&name=" + queryName + "&enable=" + enable;
|
|
}
|
|
}
|
|
|
|
|
|
- private int addStudent(MultipartFile file,Integer schoolId,Integer userId) {
|
|
|
|
|
|
+ private AddStudentInfo addStudent(MultipartFile file,Integer schoolId,Integer userId) {
|
|
try {
|
|
try {
|
|
ImportExcel ei = new ImportExcel(file, 1, 0);
|
|
ImportExcel ei = new ImportExcel(file, 1, 0);
|
|
List<UserStudentVo> list = ei.getDataList(UserStudentVo.class);
|
|
List<UserStudentVo> list = ei.getDataList(UserStudentVo.class);
|