feat:长三角比赛

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

@@ -170,7 +170,7 @@
 
 	<select id="getWinnerList" resultMap="StudentCompetition">
 		SELECT * FROM student_competition WHERE is_show_ = 1
-		ORDER BY ISNULL(prize_level_),prize_level_,ISNULL(score_),score_ DESC
+		ORDER BY ISNULL(score_),score_ DESC
 	</select>
 
 	<select id="getCompetitionWithUser" resultMap="StudentCompetition">

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.StudentCompetitionService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.idcard.IdcardValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -31,8 +32,6 @@ public class StudentCompetitionController extends BaseController {
     private StudentCompetitionService studentCompetitionService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private ContractService contractService;
 
     @ApiOperation(value = "新增参赛作品")
     @PostMapping("/add")
@@ -40,11 +39,13 @@ public class StudentCompetitionController extends BaseController {
         if(StringUtils.isBlank(studentCompetition.getUsername())||StringUtils.isBlank(studentCompetition.getIdCardNo())){
             return failed("参赛选手身份信息不完整");
         }
+        if(!new IdcardValidator().isValidatedAllIdcard(studentCompetition.getIdCardNo())){
+            return failed("省份证号错误");
+        }
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("请登录");
         }
-        contractService.register(sysUser.getId(), studentCompetition.getUsername(), studentCompetition.getIdCardNo(),sysUser.getPhone());
         studentCompetition.setUserId(sysUser.getId());
         studentCompetitionService.addStudentCompetition(studentCompetition);
         return succeed();