Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/entity/SysUser.java

@@ -5,8 +5,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
-import java.util.Set;
 
 /**
  * 对应数据库表(sys_user):
@@ -95,7 +93,7 @@ public class SysUser implements Serializable{
 	private Boolean isSuperAdmin = false;
 
 	@ApiModelProperty(value = "用户角色",required = false)
-	private Set<Integer> roles;
+	private Integer roles;
 
 //	private String tenantId;
 
@@ -299,11 +297,11 @@ public class SysUser implements Serializable{
 		this.isSuperAdmin = isSuperAdmin;
 	}
 
-	public Set<Integer> getRoles() {
+	public Integer getRoles() {
 		return roles;
 	}
 
-	public void setRoles(Set<Integer> roles) {
+	public void setRoles(Integer roles) {
 		this.roles = roles;
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -15,6 +15,7 @@ import java.util.Map;
 public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     List<ExamRegistrationRoomDto> queryExamRegist(Map<String, Object> params);
+
     int countExamRegist(Map<String, Object> params);
 
     /**
@@ -74,11 +75,11 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
                                                   @Param("studentIds") List<Integer> studentIds);
 
     /**
+     * @param registIds:
+     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
      * @describe 获取指定报名记录
      * @author Joburgess
      * @date 2020.07.12
-     * @param registIds:
-     * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
      */
     List<ExamRegistration> getRegists(@Param("registIds") List<Long> registIds);
 
@@ -122,8 +123,20 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
      * 获取单条报名信息
+     *
      * @param id
      * @return
      */
     ExamRegistration getExamRegistrationInfo(@Param("id") Integer id);
+
+    /**
+     * 根据考试项目id专业id和等级获取已报名的信息
+     *
+     * @param examId
+     * @param subjectId
+     * @param level
+     * @return
+     */
+    ExamRegistration getRegistration(@Param("examId") Long examId, @Param("studentId") Integer studentId, @Param("subjectId") Integer subjectId, @Param("level") Integer level);
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/SysUserDao.java

@@ -57,20 +57,20 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param id
 	 * @param roles
 	 */
-	void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roles") Set<Integer> roles);
+	void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roles") Integer roles);
 	/**
 	 * 批量新增用户角色
 	 * @param userIds
 	 * @param roles
 	 */
-	void batchAddEmployeeRoles(@Param("userIds") List<Integer> userIds, @Param("roles") Set<Integer> roles);
+	void batchAddEmployeeRoles(@Param("userIds") List<Integer> userIds, @Param("roles") Integer roles);
 
 	/**
-	 * 获取用户角色列表
+	 * 获取用户角色
 	 * @param userId
 	 * @return
 	 */
-    Set<Integer> queryRoleIds(Integer userId);
+	Integer queryRoleIds(Integer userId);
 
 	/**
 	 * 修改userType

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/TenantInfoDao.java

@@ -11,6 +11,7 @@ import java.util.Map;
 public interface TenantInfoDao extends BaseDAO<Integer, TenantInfo> {
 
     List<TenantInfoDto> queryTenants(Map<String, Object> params);
+
     int countTenants(Map<String, Object> params);
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/TenantInfoDto.java

@@ -8,15 +8,15 @@ import com.keao.edu.user.entity.TenantInfo;
  */
 public class TenantInfoDto extends TenantInfo {
 
-    private String roleIds;
+    private Integer roleIds;
 
     private String roleNames;
 
-    public String getRoleIds() {
+    public Integer getRoleIds() {
         return roleIds;
     }
 
-    public void setRoleIds(String roleIds) {
+    public void setRoleIds(Integer roleIds) {
         this.roleIds = roleIds;
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationQueryInfo.java

@@ -10,8 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class ExamRegistrationQueryInfo extends QueryInfo {
 
-    @ApiModelProperty(value = "合作单位编号")
-    private Integer organId;
+//    @ApiModelProperty(value = "合作单位编号")
+//    private Integer organId;
 
     @ApiModelProperty(value = "考试报名编号")
     private Integer examRegistrationId;
@@ -53,13 +53,13 @@ public class ExamRegistrationQueryInfo extends QueryInfo {
         this.studentId = studentId;
     }
 
-    public Integer getOrganId() {
-        return organId;
-    }
+//    public Integer getOrganId() {
+//        return organId;
+//    }
 
-    public void setOrganId(Integer organId) {
-        this.organId = organId;
-    }
+//    public void setOrganId(Integer organId) {
+//        this.organId = organId;
+//    }
 
     public Integer getExamId() {
         return examId;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -81,7 +81,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				}else {
 					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
 				}
-				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(sysUser1.getId(),sysUser.getRoles());
 				}
 				sysUser.setId(sysUser1.getId());
@@ -131,7 +131,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
 
 			sysUserDao.batchDelEmployeeRole(userIds);
-			if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+			if(sysUser.getRoles() != null){
 				sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
 			}
 		}else {
@@ -169,7 +169,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	public Employee getEmployee(Integer id) {
 		Employee employee = employeeDao.get(id);
 		SysUser sysUser = employee.getSysUser();
-		Set<Integer> roleIds = sysUserDao.queryRoleIds(sysUser.getId());
+        Integer roleIds = sysUserDao.queryRoleIds(sysUser.getId());
 		sysUser.setRoles(roleIds);
 		return employee;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -64,7 +64,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addRegistration(ExamRegistration examRegistration) throws Exception {
-        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId().longValue());
+        ExaminationBasic examinationBasic = examinationBasicDao.get(examRegistration.getExaminationBasicId());
         if (examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)) {
             throw new BizException("项目不在报名中，请核对");
         }
@@ -82,6 +82,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         if (organization == null) {
             throw new BizException("机构不存在");
         }
+
+        ExamRegistration registration = examRegistrationDao.getRegistration(examinationBasic.getId(), examRegistration.getStudentId(), examRegistration.getSubjectId(), examSubjectSong.getLevel());
+        if(registration != null){
+            throw new BizException("该考级相同专业及等级您已报名，请勿重复报名");
+        }
+
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";
 
@@ -157,8 +163,8 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
-        List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
-        params.put("organIds", nextLevelOrganIds);
+//        List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+//        params.put("organIds", nextLevelOrganIds);
 
         List<ExamRegistrationRoomDto> dataList = Collections.EMPTY_LIST;
         int count = examRegistrationDao.countExamRegist(params);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -87,7 +87,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				organ.setUserId(user.getId());
 				organDao.insert(organ);
 				//新增用户角色
-				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
 				}
 				if(!user.getUserType().contains("SYSTEM")){
@@ -105,7 +105,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				}
 				sysUser.setId(sysUser1.getId());
 				sysUserDao.update(sysUser);
-				if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 				}
 				Employee employee = employeeDao.get(sysUser.getId());
@@ -131,7 +131,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		organDao.insert(organ);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
-		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+		if(sysUser.getRoles() != null){
 			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
 		}
 		Employee employee = new Employee();
@@ -170,7 +170,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		List<Integer> userIds = childOrgans.stream().map(e -> e.getUserId()).collect(Collectors.toList());
 
 		sysUserDao.batchDelEmployeeRole(userIds);
-		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+		if(sysUser.getRoles() != null){
 			sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
 		}
 
@@ -264,7 +264,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	public Organization getOrganization(Integer id) {
 		Organization organization = organDao.get(id);
 		SysUser sysUser = organization.getSysUser();
-		Set<Integer> roleIds = sysUserDao.queryRoleIds(organization.getUserId());
+		Integer roleIds = sysUserDao.queryRoleIds(organization.getUserId());
 		sysUser.setRoles(roleIds);
 		return organization;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TenantInfoServiceImpl.java

@@ -69,9 +69,9 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		sysUser.setAvatar(tenantInfo.getLogoUrl());
 		sysUser.setPhone(tenantInfo.getContactPhone());
 		sysUserDao.insert(sysUser);
-		if(StringUtils.isNotBlank(tenantInfo.getRoleIds())){
-			Set<Integer> roleIds = Arrays.stream(tenantInfo.getRoleIds().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toSet());
-			sysUserDao.batchAddEmployeeRole(sysUser.getId(), roleIds);
+		if(tenantInfo.getRoleIds() != null){
+//			Set<Integer> roleIds = Arrays.stream(tenantInfo.getRoleIds().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toSet());
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(), tenantInfo.getRoleIds());
 		}
 
 		Organization organ=new Organization();
@@ -109,13 +109,13 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		if(Objects.isNull(sysUser)){
 			throw new BizException("机构账户不存在");
 		}
-		if(StringUtils.isNotBlank(newTenantInfo.getRoleIds())){
+		if(newTenantInfo.getRoleIds() != null){
 
-			Set<Integer> roleIds = Arrays.stream(newTenantInfo.getRoleIds().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toSet());
+//			Set<Integer> roleIds = Arrays.stream(newTenantInfo.getRoleIds().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toSet());
 			//删除当前用户角色
 			sysUserDao.delEmployeeRole(sysUser.getId());
 			//新增用户角色
-			sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(),newTenantInfo.getRoleIds());
 		}
 		if(StringUtils.isNotBlank(newTenantInfo.getContactName())){
 			sysUser.setRealName(newTenantInfo.getContactName());

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -141,7 +141,7 @@
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
-			<if test="organId!=null">
+			<if test="organId != null">
 				AND er.organ_id_ = #{organId}
 			</if>
 			<if test="subjectId!=null">
@@ -424,4 +424,8 @@
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{id}
 	</select>
+
+	<select id="getRegistration" resultMap="ExamRegistration">
+		SELECT * FROM exam_registration WHERE examination_basic_id_ = #{examId}  AND student_id_ =#{studentId} AND subject_id_=#{subjectId} AND level_ = #{level} LIMIT 1
+	</select>
 </mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -189,21 +189,15 @@
     <select id="queryRoleIds" resultType="java.lang.Integer">
         SELECT sur.role_id_ FROM employee e
 		LEFT JOIN sys_user_role sur ON e.user_id_ = sur.user_id_
-		WHERE e.user_id_ = #{userId}
+		WHERE e.user_id_ = #{userId} LIMIT 1
     </select>
 
     <insert id="batchAddEmployeeRole">
-        INSERT INTO sys_user_role(user_id_,role_id_) values
-        <foreach collection="roles" item="item" index="index" separator=",">
-            (#{userId},#{item})
-        </foreach>
+        INSERT INTO sys_user_role(user_id_,role_id_) VALUES (#{userId},#{roles})
     </insert>
     <insert id="batchAddEmployeeRoles">
         <foreach collection="userIds" item="userId" separator=";">
-            INSERT INTO sys_user_role(user_id_,role_id_) values
-            <foreach collection="roles" item="item" index="index" separator=",">
-                (#{userId},#{item})
-            </foreach>
+            INSERT INTO sys_user_role(user_id_,role_id_) values VALUES (#{userId},#{roles})
         </foreach>
     </insert>
 

edu-user/edu-user-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -102,8 +102,8 @@
 	<select id="queryTenants" resultMap="TenantInfoDto" parameterType="map">
 		SELECT
 			ti.*,
-			GROUP_CONCAT(sr.id_) role_ids_,
-			GROUP_CONCAT(sr.role_name_) role_names_
+			GROUP_CONCAT(DISTINCT sr.id_) role_ids_,
+			GROUP_CONCAT(DISTINCT sr.role_name_) role_names_
 		FROM tenant_info ti
 		LEFT JOIN sys_user su ON ti.contact_phone_ = su.phone_
 		LEFT JOIN sys_user_role sur ON sur.user_id_ = su.id_