+ * 大赛团队队员表 前端控制器 + *
+ * + * @author author + * @since 2024-08-27 + */ +@RestController +@RequestMapping("system/hit-team-members") +public class HitTeamMembersController extends BaseController { + + @Autowired + private IHitTeamMembersService hitTeamMembersService; + + /** + * 同意加入团队 + * @param teamId + * @param teamMateId + * @return + */ + @PutMapping("/agreeTeam") + public AjaxResult agree(@RequestParam Long teamId , @RequestParam Long teamMateId){ + return AjaxResult.success(hitTeamMembersService.agreeTeam(teamId, teamMateId)); + } + + + /** + * 拒绝加入团队 + * @param teamId + * @return + */ + @DeleteMapping("/refuseTeam") + public AjaxResult refuse(@RequestParam Long teamId ){ + return AjaxResult.success(hitTeamMembersService.refuseTeam(teamId)) ; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitTeamsController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitTeamsController.java new file mode 100644 index 0000000..3a69971 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitTeamsController.java @@ -0,0 +1,38 @@ +package com.ruoyi.cms.controller; + + +import com.ruoyi.cms.domain.Preliminary; + +import com.ruoyi.cms.service.IHitTeamsService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *+ * 团队表 前端控制器 + *
+ * + * @author author + * @since 2024-08-27 + */ +@RestController +@RequestMapping("system/hit-teams") +public class HitTeamsController extends BaseController { + + @Autowired + private IHitTeamsService hitTeamsService; + + /** + * 初赛预报名 + */ + @PostMapping("/pre-register") + public AjaxResult preRegister(@RequestBody Preliminary preliminary){ + return toAjax(hitTeamsService.preRegister(preliminary)) ; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java new file mode 100644 index 0000000..49e07db --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java @@ -0,0 +1,98 @@ +package com.ruoyi.cms.domain; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 大赛学生表 + *
+ * + * @author author + * @since 2024-08-26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("hit_competition_student_info") +@ApiModel(value="HitCompetitionStudentInfo对象", description="大赛学生表") +public class HitCompetitionStudentInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "团队报名主键") + private String hitRegId; + + @ApiModelProperty(value = "学生姓名") + private String stuName; + + @ApiModelProperty(value = "学号") + private String studentId; + + @ApiModelProperty(value = "学校名称") + private String schoolName; + + @ApiModelProperty(value = "院系名称") + private String collegeName; + + @ApiModelProperty(value = "专业") + private String major; + + @ApiModelProperty(value = "所属赛区") + private String division; + + @ApiModelProperty(value = "手机号") + private String phoneNumber; + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "学生证") + private String studentIdCard; + + @ApiModelProperty(value = "个人选拔赛分数") + private BigDecimal trialsScore; + + @ApiModelProperty(value = "是否被选为参加初赛人员 (0: 否, 1: 是)") + private Boolean isPreliminary; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "逻辑删除 0未删除 1真删除") + private Boolean delFlag; + + @ApiModelProperty(value = "创建时间（默认时间当前）") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "更新时间（默认时间当前）") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @ApiModelProperty(value = "更新人") + private String updateBy; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java index b4d93e0..c92940d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java @@ -3,9 +3,8 @@ package com.ruoyi.cms.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -64,7 +63,7 @@ public class HitRegInfo extends BaseEntity /** 逻辑删除0未删除1真删除 */ private Long delFlag; @TableField(exist = false) - private List+ * 大赛团队队员表 + *
+ * + * @author author + * @since 2024-08-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("hit_team_members") +@ApiModel(value="HitTeamMembers对象", description="大赛团队队员表") +public class HitTeamMembers implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "团队id") + private String teamId; + + @ApiModelProperty(value = "队友id") + private String teamMemberId; + + @ApiModelProperty(value = "0队员，1领队老师, 2指导老师") + private Integer teamResponsibilities; + + @ApiModelProperty(value = "0等待确认，1同意, 2拒绝") + private Integer isAgreeWith; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @ApiModelProperty(value = "修改人") + private String updateBy; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitTeams.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitTeams.java new file mode 100644 index 0000000..926a66a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitTeams.java @@ -0,0 +1,63 @@ +package com.ruoyi.cms.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *+ * 团队表 + *
+ * + * @author author + * @since 2024-08-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("hit_teams") +@ApiModel(value="HitTeams对象", description="团队表") +public class HitTeams implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "团队名称") + private String teamName; + + @ApiModelProperty(value = "赛区") + private String division; + + @ApiModelProperty(value = "学校") + private String schoolName; + + @ApiModelProperty(value = "团队创建者id") + private Integer teamCreatorId; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @ApiModelProperty(value = "修改人") + private String updateBy; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java new file mode 100644 index 0000000..36ad2d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java @@ -0,0 +1,107 @@ +package com.ruoyi.cms.domain; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 大赛预报名表 preliminary + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Preliminary { + + /** 队伍名称 */ + private String teamName; + + /** 赛区 */ + private String division; + + /** 学校名称 */ + private String schoolName; + + /** 队员1 */ + private String TeammateOne; + + /** 队员2 */ + private String teammateTwo; + + /** 领队老师 */ + private String LeaderTeacher; + + /** 指导老师1 */ + private String teacherOne; + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getDivision() { + return division; + } + + public void setDivision(String division) { + this.division = division; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + public String getTeammateOne() { + return TeammateOne; + } + + public void setTeammateOne(String teammateOne) { + TeammateOne = teammateOne; + } + + public String getTeammateTwo() { + return teammateTwo; + } + + public void setTeammateTwo(String teammateTwo) { + this.teammateTwo = teammateTwo; + } + + public String getLeaderTeacher() { + return LeaderTeacher; + } + + public void setLeaderTeacher(String leaderTeacher) { + LeaderTeacher = leaderTeacher; + } + + public String getTeacherOne() { + return teacherOne; + } + + public void setTeacherOne(String teacherOne) { + this.teacherOne = teacherOne; + } + + public String getTeacherTwo() { + return teacherTwo; + } + + public void setTeacherTwo(String teacherTwo) { + this.teacherTwo = teacherTwo; + } + + /** 指导老师2 */ + private String teacherTwo; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/TeamsVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/TeamsVo.java new file mode 100644 index 0000000..b30fc96 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/TeamsVo.java @@ -0,0 +1,22 @@ +package com.ruoyi.cms.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 团队信息 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TeamsVo { + /** 团队id */ + private Long teamId; + /** 团队名称 */ + private String teamName; + /** 团队成员id */ + private Long teamMateId; + /** 团队成员状态 */ + private String isAgreeWith; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java new file mode 100644 index 0000000..c56bc3b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.cms.mapper; + +import com.ruoyi.cms.domain.HitCompetitionStudentInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *+ * 大赛学生表 Mapper 接口 + *
+ * + * @author author + * @since 2024-08-26 + */ +public interface HitCompetitionStudentInfoMapper extends BaseMapper+ * 大赛团队队员表 Mapper 接口 + *
+ * + * @author author + * @since 2024-08-27 + */ +public interface HitTeamMembersMapper extends BaseMapper+ * 团队表 Mapper 接口 + *
+ * + * @author author + * @since 2024-08-27 + */ +public interface HitTeamsMapper extends BaseMapper+ * 大赛学生表 服务类 + *
+ * + * @author author + * @since 2024-08-26 + */ +public interface IHitCompetitionStudentInfoService extends IService+ * 大赛团队队员表 服务类 + *
+ * + * @author author + * @since 2024-08-27 + */ +public interface IHitTeamMembersService extends IService+ * 团队表 服务类 + *
+ * + * @author author + * @since 2024-08-27 + */ +public interface IHitTeamsService extends IService+ * 大赛学生表 服务实现类 + *
+ * + * @author author + * @since 2024-08-26 + */ +@Service +public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl+ * 大赛团队队员表 服务实现类 + *
+ * + * @author author + * @since 2024-08-27 + */ +@Service +public class HitTeamMembersServiceImpl extends ServiceImpl+ * 团队表 服务实现类 + *
+ * + * @author author + * @since 2024-08-27 + */ +@Service +public class HitTeamsServiceImpl extends ServiceImpl
@@ -16,7 +17,6 @@
![]()
{{ item.label }}
-
+ 登录
+ 注册
+
+
+
+
+ {{ currentUser }}
+
+
+ 退出登录
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住密码
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
-
-
-
参赛报名表（本科组）
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 领队老师
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
指导老师①
- - -
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 指导老师②
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参赛人信息①
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
- 参赛人信息②
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 参赛人信息③
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 提交
+
+
-
+
-
+
- 盲样邮寄地址
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 成绩未出，耐心等待
+
+ 很遗憾，个人选拔赛未通过，您的个人成绩为 : {{ signUpForm.trialsScore }}
+
+ 初赛成绩：{{ signUpForm.trialsScore }}
+
+
+
-
-
-
+
-
-
-
+
-
+
+ 提交
+
-
-
-
-
- 下载模版
-
-
-
+
+ 附件上传
-
+
+
+ 是否加入队伍{{teammateInfo.teamName }}
+
+
+ 拒绝组队
+ 确认组队
+
+
+
+
+
-
-
+ 已加入队伍{{teammateInfo.teamName }},等待其他队友加入
+
-
- 提交
-
-
-
+
+
+ 初赛报名提交成功，请通过大赛通知获取通过信息
+
-
- ![]()
-
{{item.contentTitle}}
+
+
-
+ ![]()
+
{{ item.contentTitle }}
-
-
-
-
-
+
+
+
+
+
+
-
-
{{item.publishDate}}
- {{item.contentTitle}}
- {{item.summary || '' }}
+ {{ item.publishDate }}
+ {{ item.contentTitle }}
+ {{ item.summary || '' }}
- ![]()
+ ![]()
-
+
-
+
@@ -325,14 +190,15 @@