考级报名活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DegreeRegistrationDao.java

@@ -26,7 +26,8 @@ public interface DegreeRegistrationDao extends BaseDAO<Integer, DegreeRegistrati
                                                  @Param("degreeType") Integer degreeType,
                                                  @Param("sporadicId") String sporadicId,
                                                  @Param("level") String level,
-                                                 @Param("status") Integer status);
+                                                 @Param("status") Integer status,
+                                                 @Param("subject") String subject);
 
     void batchInsert(@Param("degreeRegistrationList") List<DegreeRegistration> degreeRegistrationList);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationDao.java

@@ -58,4 +58,6 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 	
 	List<Organization> findAllOrgans(Integer tenantId);
 
+	//根据城市获取分部
+    Organization findByName(@Param("city") String city);
 }

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

@@ -494,7 +494,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if(!CollectionUtils.isEmpty(collect)){
             List<Integer> collect1 = collect.stream().map(e -> e.getSporadicId()).collect(Collectors.toList());
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
-                    DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),StringUtils.join(collect1,","),null,2);
+                    DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),StringUtils.join(collect1,",")
+                    ,null,2,degreeRegistration.getSubject());
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
                 return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐器考级已报名，请勿重复选择");
             }
@@ -503,7 +504,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if(!CollectionUtils.isEmpty(collect)){
             List<String> collect1 = collect.stream().map(e -> e.getLevel()).collect(Collectors.toList());
             List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
-                    DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),null,StringUtils.join(collect1,","),2);
+                    DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),null,StringUtils.join(collect1,","),2,null);
             if(!CollectionUtils.isEmpty(userLevelDegrees)){
                 return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() +  " 乐理考级已报名，请勿重复选择");
             }

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

@@ -346,6 +346,9 @@
             <if test="status != null">
                 AND status_ = #{status}
             </if>
+            <if test="subject != null and subject != ''">
+                AND subject_ = #{subject}
+            </if>
             <if test="sporadicId != null and sporadicId != ''">
                 AND FIND_IN_SET(sporadic_id_,#{sporadicId})
             </if>

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

@@ -178,5 +178,8 @@
              </foreach>
          </if>
     </select>
+    <select id="findByName" resultMap="Organization">
+        SELECT * FROM organization WHERE #{city} LIKE CONCAT('%',name_,'%') AND tenant_id_ = 1 AND del_flag_ = 0 LIMIT 1
+    </select>
 
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/DegreeController.java

@@ -6,6 +6,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SysAreaDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.SysArea;
@@ -46,6 +47,9 @@ public class DegreeController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 
     @Autowired
+    private TeacherDao teacherDao;
+
+    @Autowired
     private SysTenantConfigService sysTenantConfigService;
 
     @Autowired
@@ -80,6 +84,13 @@ public class DegreeController extends BaseController {
 	            throw new BizException("身份证号不正确，请核对");
 	        }
         }
+        if(user.getOrganId() == null || user.getOrganId() == 43){
+            Organization organization = organizationDao.findByName(degreeRegistration.getCity());
+            if(Objects.nonNull(organization)){
+                user.setOrganId(organization.getId());
+                teacherDao.updateUser(user);
+            }
+        }
         degreeRegistration.setOrganId(user.getOrganId());
         if(Objects.isNull(degreeRegistration.getOrganId())){
             return failed("该分部暂未开放此活动");

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
@@ -26,6 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**