Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -55,16 +55,16 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
                 userLogin.setLastLoginIp(hashMap.get("remoteAddress"));
                 sysUserLoginService.insert(userLogin);
             }else {
-                userLogin.setFailCount(userLogin.getFailCount() + 1);
+//                userLogin.setFailCount(userLogin.getFailCount() + 1);
                 userLogin.setLastLoginTime(date);
                 userLogin.setLastLoginIp(hashMap.get("remoteAddress"));
-                if(userLogin.getFailCount() >= 5){
+                /*if(userLogin.getFailCount() >= 5){
                     userLogin.setLockTime(30);
                     userLogin.setLockDate(date);
                     sysUser.setLockFlag(9);
                     sysUser.setUpdateTime(date);
                     sysUserService.update(sysUser);
-                }
+                }*/
                 sysUserLoginService.update(userLogin);
             }
             logger.info("用户：{} 登录失败", sysUser.getPhone());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -209,6 +209,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setRealName(studentRegistration.getParentsName());
             sysUser.setUsername(studentRegistration.getName());
             sysUser.setIdCardNo(studentRegistration.getIdCardNo());
+            sysUser.setBirthdate(studentRegistration.getBirthdate());
             teacherDao.addSysUser(sysUser);
             userId = sysUser.getId();
             //添加用户现金账户
@@ -219,18 +220,21 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }
             ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
             sysUser.setImToken(register.getToken());
+        }else{
+            if(!sysUser.getUserType().equals(SysUserType.STUDENT)){
+                throw new BizException("您系统存在非学生的账户，不能注册学生");
+            }
+            sysUser.setUserType(SysUserType.STUDENT);
+            sysUser.setPhone(studentRegistration.getParentsPhone());
+            sysUser.setOrganId(studentRegistration.getOrganId());
+            sysUser.setRealName(studentRegistration.getParentsName());
+            sysUser.setUsername(studentRegistration.getName());
+            sysUser.setGender(studentRegistration.getGender());
+            sysUser.setBirthdate(studentRegistration.getBirthdate());
+            sysUser.setCreateTime(date);
+            sysUser.setUpdateTime(date);
+            teacherDao.updateUser(sysUser);
         }
-        if(!sysUser.getUserType().equals(SysUserType.STUDENT)){
-            throw new BizException("您系统存在非学生的账户，不能注册学生");
-        }
-        sysUser.setUserType(SysUserType.STUDENT);
-        sysUser.setOrganId(studentRegistration.getOrganId());
-        sysUser.setRealName(studentRegistration.getParentsName());
-        sysUser.setUsername(studentRegistration.getName());
-        sysUser.setGender(studentRegistration.getGender());
-        sysUser.setCreateTime(date);
-        sysUser.setUpdateTime(date);
-        teacherDao.updateUser(sysUser);
 
         studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
         studentRegistration.setCreateTime(date);
@@ -509,6 +513,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setImToken(register.getToken());
                 teacherDao.updateUser(sysUser);
             } else {
+                if(!sysUser.getUserType().equals(SysUserType.STUDENT)){
+                    throw new BizException("您系统存在非学生的账户，不能注册学生");
+                }
                 sysUser.setPhone(studentRegistration.getParentsPhone());
                 sysUser.setRealName(studentRegistration.getParentsName());
                 sysUser.setUsername(studentRegistration.getName());
@@ -524,8 +531,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
             studentRegistration.setTemporaryCourseFee(studentAddDto.getTemporaryCourseFee());
             //学生报名表
-
-
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
 
@@ -588,6 +593,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             }else {
                 studentRegistrationDao.insertBasic(studentRegistration);
             }
+            studentRegistrationDao.updateCurrentClass(studentRegistration);
             studentPaymentOrderService.insert(studentPaymentOrder);
             studentPaymentOrderDetails.forEach(e -> {
                 e.setPaymentOrderId(studentPaymentOrder.getId());

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -181,12 +181,19 @@
         SELECT ue.*,o.name_ organ_name_list_,o.id_ organ_id_list_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
         e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_
-        FROM employee e LEFT JOIN sys_user su ON e.user_id_ = su.id_
+        FROM employee e
+        LEFT JOIN sys_user su ON e.user_id_ = su.id_
+        <if test="roleId != null">
+            LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
+        </if>
         <where>
             su.user_type_ = 'SYSTEM'
             <if test="organId != null">
                 AND INTE_ARRAY(e.organ_id_list_,#{organId})
             </if>
+            <if test="roleId != null">
+                AND sur.role_id_ = #{roleId}
+            </if>
             <if test="jobNature != null">
                 AND e.job_nature_ = #{jobNature}
             </if>
@@ -202,7 +209,11 @@
 
     <select id="queryEmployByOrganIdCount" resultType="int">
         SELECT COUNT(DISTINCT e.user_id_)
-        FROM employee e LEFT JOIN sys_user su ON e.user_id_ = su.id_
+        FROM employee e
+        LEFT JOIN sys_user su ON e.user_id_ = su.id_
+        <if test="roleId != null">
+            LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
+        </if>
         <where>
             su.user_type_ = 'SYSTEM'
             <if test="organId != null">
@@ -211,6 +222,9 @@
             <if test="search != null">
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>
+            <if test="roleId != null">
+                AND sur.role_id_ = #{roleId}
+            </if>
         </where>
     </select>
     <select id="queryUserRole" resultType="java.lang.Integer">

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -146,6 +146,9 @@
             <if test="subjectId != null">
                 subject_id_ = #{subjectId},
             </if>
+            <if test="currentGrade != null">
+                current_grade_ = #{currentGrade},
+            </if>
             <if test="currentClass != null">
                 current_class_ = #{currentClass},
             </if>

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -51,9 +51,12 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
-        SELECT t.*,su.real_name_,su.password_,su.salt_,su.phone_,su.avatar_,
+        SELECT t.id_,t.organ_id_ teacher_organ_id_,t.job_type_,t.is_probation_period_,t.education_background_,t.graduate_school_,t.graduate_school_,
+        t.technical_titles_,t.work_unit_,t.subject_id_,t.entry_date_,t.certificate_type_,t.certificate_num_,t.flow_organ_range_,t.update_time_,
+        t.create_time_,t.introduction_,t.demission_date_,t.is_support_course_schedule_rewards_rules_,
+        su.real_name_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
-        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,su.username_
+        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,su.username_,su.organ_id_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE t.id_ = #{id} AND su.del_flag_ = 0

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSchoolController.java

@@ -2,7 +2,9 @@ package com.ym.mec.teacher.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.service.SchoolService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -30,6 +32,8 @@ public class TeacherSchoolController extends BaseController {
     @Autowired
     private SchoolService schoolService;
     @Autowired
+    private TeacherDao teacherDao;
+    @Autowired
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增学校")
@@ -39,7 +43,9 @@ public class TeacherSchoolController extends BaseController {
         if(sysUser == null){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
+        Teacher teacher = teacherDao.get(sysUser.getId());
         school.setUserId(sysUser.getId());
+        school.setOrganId(teacher.getTeacherOrganId());
         schoolService.insert(school);
         return succeed();
     }

mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -1,23 +1,5 @@
 package com.ym.mec.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
@@ -26,6 +8,17 @@ import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.CooperationOrganQueryInfo;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 @RequestMapping("cooperationOrgan")
 @Api(tags = "合作单位(教学点)服务")