xiatian 1 éve
szülő
commit
68252e5a7f

+ 24 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/AddStudentInfo.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.stmms.biz.exam.bean;
+
+public class AddStudentInfo {
+	private Integer success;
+	private Integer failed;
+	public Integer getSuccess() {
+		return success;
+	}
+	public void setSuccess(Integer success) {
+		this.success = success;
+	}
+	public Integer getFailed() {
+		return failed;
+	}
+	public void setFailed(Integer failed) {
+		this.failed = failed;
+	}
+	public AddStudentInfo(Integer success, Integer failed) {
+		super();
+		this.success = success;
+		this.failed = failed;
+	}
+	
+}

+ 2 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/UserStudentService.java

@@ -2,11 +2,12 @@ package cn.com.qmth.stmms.biz.exam.service;
 
 import java.util.List;
 
+import cn.com.qmth.stmms.biz.exam.bean.AddStudentInfo;
 import cn.com.qmth.stmms.biz.exam.bean.UserStudentVo;
 
 public interface UserStudentService {
 
-	public int addStudent(List<UserStudentVo> list,Integer schoolId,Integer userId);
+	public AddStudentInfo addStudent(List<UserStudentVo> list,Integer schoolId,Integer userId);
 
 	public int countByUserId(Integer id);
 

+ 6 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/UserStudentServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.stmms.biz.common.BaseQueryService;
+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.dao.UserStudentDao;
 import cn.com.qmth.stmms.biz.exam.model.UserStudent;
@@ -30,9 +31,11 @@ public class UserStudentServiceImpl extends BaseQueryService<UserStudent> implem
 	
 	@Transactional
 	@Override
-	public int addStudent(List<UserStudentVo> list,Integer schoolId, Integer userId) {
+	public AddStudentInfo addStudent(List<UserStudentVo> list,Integer schoolId, Integer userId) {
 		int suc=0;
+		int total=0;
 		if(list!=null&&list.size()>0) {
+			total=list.size();
 			suc=new BatchUpdateDataUtil<UserStudentVo>() {
 				@Override
 				protected int updateData(List<UserStudentVo> dataList) {
@@ -47,7 +50,8 @@ public class UserStudentServiceImpl extends BaseQueryService<UserStudent> implem
 				}
 			}.setDataForBatch(list, 500);
 		}
-		return suc;
+		AddStudentInfo info=new AddStudentInfo(suc, total-suc);
+		return info;
 	}
 
 	@Override

+ 4 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -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.SubjectUserDTO;
 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.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
@@ -164,7 +165,7 @@ public class UserController extends BaseExamController {
         if (user.getId() != null) {
             previous = userService.findById(user.getId());
         }
-        Integer suc=null;
+        AddStudentInfo suc=null;
         if (previous == null) {
             String message = validate(user, subjectCodeString, examIdString);
             if (message == null) {
@@ -276,13 +277,13 @@ public class UserController extends BaseExamController {
         String role = queryRole == null ? "" : String.valueOf(queryRole.getValue());
         String source = querySource == null ? "" : String.valueOf(querySource.getValue());
         if(suc!=null) {
-        	addMessage(redirectAttributes, "成功绑定考生"+suc+"条");
+        	addMessage(redirectAttributes, "成功绑定考生"+suc.getSuccess()+"条,失败"+suc.getFailed()+"条(已绑定或无效的准考证号)");
         }
         return "redirect:/admin/user/list?pageNumber=" + pageNumber + "&source=" + source + "&role=" + role
                 + "&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 {
 			ImportExcel ei = new ImportExcel(file, 1, 0);
 			List<UserStudentVo> list = ei.getDataList(UserStudentVo.class);