Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

hanshuai

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -126,7 +126,7 @@ public class BStudentServiceImpl implements BStudentService {
 
         ArrayList<SysUser> users = new ArrayList<SysUser>();
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"学号", "学生姓名", "性别","邮箱","年级"};
+        String[] headers = {"学号", "学生姓名", "性别","年级"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,1);  //获取excel数据
         
         if (values.size()<=0){
@@ -162,21 +162,21 @@ public class BStudentServiceImpl implements BStudentService {
             }
 
             //判断3:邮箱是否存在、格式是否正确；
-            SysUser user2 = new SysUser();
-            user2.setEmail(value[3]);
-            boolean nullEmail = StringUtils.isEmpty(value[3]);
-            boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
-            boolean emailRepeat = sysUserMapper.selectOne(user2)!=null;
-            if(nullEmail||!emailCheck||emailRepeat){
-                valuesEmailExist.add(value[3]);
-                continue;
-            }
+//            SysUser user2 = new SysUser();
+//            user2.setEmail(value[3]);
+//            boolean nullEmail = StringUtils.isEmpty(value[3]);
+//            boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
+//            boolean emailRepeat = sysUserMapper.selectOne(user2)!=null;
+//            if(nullEmail||!emailCheck||emailRepeat){
+//                valuesEmailExist.add(value[3]);
+//                continue;
+//            }
 
             //判断4:学年是否存在，存在才能录入
             BStudent bs = new BStudent();
-            bs.setGradeCode(value[4]);
+            bs.setGradeCode(value[3]);
             if (bStudentRepository.checkStudentGrade(bs).size() == 0){
-                valuesGrade.add(value[4]);
+                valuesGrade.add(value[3]);
                 continue;
             }
 
@@ -191,7 +191,7 @@ public class BStudentServiceImpl implements BStudentService {
                 value[2] = "";
             //1. 添加user
             SysUser user = new SysUser(value[0], passwordEncoder.encode(global.getDEFAULT_PASSWORD()), value[1], value[2]);  //学号，密码，姓名，性别;
-            user.setEmail(value[3]);
+//            user.setEmail(value[3]);
             UserUtil.setCurrentPersistOperation(user);
             //2 创建gitlab账户
             /*GitUser gitUser = new GitUser();
@@ -212,7 +212,7 @@ public class BStudentServiceImpl implements BStudentService {
 
             //创建完Gitlab账户后，将完整的User信息和UserRole计入users和userRoles中等待插入数据库
             BStudent bStudent = new BStudent(value[0]);
-            bStudent.setGradeCode(value[4]);
+            bStudent.setGradeCode(value[3]);
             UserUtil.setCurrentPersistOperation(bStudent);
             if (!students.contains(bStudent)) {
                 students.add(bStudent);

src/main/java/org/rcisoft/business/bteacher/controller/BTeacherController.java

@@ -40,7 +40,7 @@ public class BTeacherController extends PaginationController<BTeacher> {
     @ApiOperation(value="添加/编辑教师信息", notes="businessId为空时是添加方法，不为空时是修改方法")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "教师工号(1-11)", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "email", value = "邮箱", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "email", value = "邮箱", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "name", value = "教室姓名", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "sex", value = "性别", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "isRecommend", value = "0:未推荐，1:推荐", required = false, dataType = "varchar"),

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -82,7 +82,7 @@ public class BTeacherServiceImpl implements BTeacherService {
 
 
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"教师工号", "教师姓名", "性别","邮箱","教学单位编号"};
+        String[] headers = {"教师工号", "教师姓名", "性别","教学单位编号"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,1);  //获取excel数据
         if (values.size() == 0){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
@@ -117,19 +117,19 @@ public class BTeacherServiceImpl implements BTeacherService {
             }
 
             //判断3:邮箱是否存在、格式是否正确；
-            SysUser user2 = new SysUser();
-            user2.setEmail(value[3]);
-            boolean nullEmail = StringUtils.isEmpty(value[3]);
-            boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
-            boolean emailRepeat = sysUserMapper.selectOne(user2)!=null;
-            if(nullEmail||!emailCheck||emailRepeat){
-                valuesEmailExist.add(value[3]);
-                continue;
-            }
+//            SysUser user2 = new SysUser();
+//            user2.setEmail(value[3]);
+//            boolean nullEmail = StringUtils.isEmpty(value[3]);
+//            boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
+//            boolean emailRepeat = sysUserMapper.selectOne(user2)!=null;
+//            if(nullEmail||!emailCheck||emailRepeat){
+//                valuesEmailExist.add(value[3]);
+//                continue;
+//            }
 
             //判断4:教师的所属教学单位是否存在，存在才能添加；
-            if (sysUserMapper.checkTeacherAgency(value[4]).size() == 0){
-                valuesAgencyExist.add(value[4]);
+            if (sysUserMapper.checkTeacherAgency(value[3]).size() == 0){
+                valuesAgencyExist.add(value[3]);
                 continue;
             }
 
@@ -145,7 +145,7 @@ public class BTeacherServiceImpl implements BTeacherService {
 
             //1. 添加user
             SysUser user = new SysUser(value[0], passwordEncoder.encode(global.getDEFAULT_PASSWORD()), value[1], value[2]);  //教师工号，密码，姓名，性别;
-            user.setEmail(value[3]);
+//          user.setEmail(value[3]);
             UserUtil.setCurrentPersistOperation(user);
             //2 创建gitlab账户
             /*GitUser gitUser = new GitUser();
@@ -165,7 +165,7 @@ public class BTeacherServiceImpl implements BTeacherService {
             userRole.setCommonBusinessId();
 
             //创建完Gitlab账户后，将完整的User信息和UserRole计入users和userRoles中等待插入数据库
-            BTeacher bTeacher= new BTeacher(value[0],value[4]);
+            BTeacher bTeacher= new BTeacher(value[0],value[3]);
             UserUtil.setCurrentPersistOperation(bTeacher);
             if (!teachers.contains(bTeacher)) {
                 teachers.add(bTeacher);
@@ -192,9 +192,9 @@ public class BTeacherServiceImpl implements BTeacherService {
         if(valuesShort.size()>0){
             result+="以下教师的工号位数不在8~15位之间："+ JSON.toJSONString(valuesShort)+"。";
         }
-        if(valuesEmailExist.size()>0){
-            result+="以下教师邮箱已注册或格式不正确："+ JSON.toJSONString(valuesEmailExist)+"。";
-        }
+//        if(valuesEmailExist.size()>0){
+//            result+="以下教师邮箱已注册或格式不正确："+ JSON.toJSONString(valuesEmailExist)+"。";
+//        }
         if (valuesAgencyExist.size()>0){
             result+="以下教师的所属教学单位不存在："+JSON.toJSONString(valuesAgencyExist)+"。";
         }
@@ -242,8 +242,11 @@ public class BTeacherServiceImpl implements BTeacherService {
             user1.setEmail(model.getEmail());
             user1.setDelFlag("0");
             user1.setFlag("1");
-            if(sysUserMapper.selectOne(user1)!=null)
-            {throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);}
+            if(user1.getEmail()!=null) {
+                if (sysUserMapper.selectOne(user1) != null) {
+                    throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);
+                }
+            }
             //1添加用户
             user.setHeadPic(global.getDEFAULT_TEACHER_LOCATION());
             UserUtil.setCurrentPersistOperation(user);