From 4fec2aec9535aaafcf2a312896df9ef38c3f0b1a Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Mon, 30 Jun 2025 09:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/HitRegInfoController.java | 63 ++-- .../controller/HitRegInfoUserController.java | 25 +- .../java/com/ruoyi/cms/domain/BaseInfo.java | 12 +- .../cms/domain/HitCompetitionStudentInfo.java | 2 +- .../java/com/ruoyi/cms/domain/HitRegInfo.java | 2 + .../HitCompetitionStudentInfoMapper.java | 1 + .../ruoyi/cms/mapper/HitRegInfoMapper.java | 1 + .../ruoyi/cms/service/IHitRegInfoService.java | 10 + .../cms/service/impl/BaseInfoServiceImpl.java | 15 +- .../service/impl/HitRegInfoServiceImpl.java | 29 +- .../cms/service/impl/HitTeamsServiceImpl.java | 8 +- .../system/SysDictDataController.java | 9 +- .../cms/HitCompetitionStudentInfoMapper.xml | 13 + .../resources/mapper/cms/HitRegInfoMapper.xml | 6 + .../framework/config/SecurityConfig.java | 2 +- .../system/mapper/SysDictDataMapper.java | 25 +- .../system/service/ISysDictDataService.java | 21 +- .../service/impl/SysDictDataServiceImpl.java | 31 +- .../mapper/system/SysDictDataMapper.xml | 49 ++- .../mapper/system/SysDictDataMapper.xml | 49 ++- ruoyi-ui/src/api/cms/baseInfo.js | 7 + .../api/officialWebsite/registerStudent.js | 7 + ruoyi-ui/src/assets/images/teamReg.png | Bin 0 -> 4892 bytes .../components/RegisterTeam/registerTeam.vue | 353 ++++++++++++++++++ ruoyi-ui/src/components/select/select.vue | 213 +++++++++++ .../hit/registrationStudentInfo/index.vue | 29 +- .../src/views/officialWebsite/competition.vue | 122 +++++- 27 files changed, 988 insertions(+), 116 deletions(-) create mode 100644 ruoyi-ui/src/assets/images/teamReg.png create mode 100644 ruoyi-ui/src/components/RegisterTeam/registerTeam.vue create mode 100644 ruoyi-ui/src/components/select/select.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java index b69cf6e..740a91e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java @@ -1,11 +1,14 @@ package com.ruoyi.cms.controller; import java.text.SimpleDateFormat; +import java.time.Year; import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.ruoyi.cms.domain.HitRegInfoUser; import com.ruoyi.cms.domain.vo.*; import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; import com.ruoyi.common.utils.bean.BeanUtils; @@ -39,8 +42,7 @@ import org.springframework.web.multipart.MultipartFile; */ @RestController @RequestMapping("/system/hit_reg_info") -public class HitRegInfoController extends BaseController -{ +public class HitRegInfoController extends BaseController { private static final Logger log = LoggerFactory.getLogger(HitRegInfoController.class); @Autowired @@ -51,18 +53,17 @@ public class HitRegInfoController extends BaseController */ @GetMapping("/list") - public TableDataInfo list(HitRegInfo hitRegInfo) - { + public TableDataInfo list(HitRegInfo hitRegInfo) { List list = hitRegInfoService.selectHitRegInfoList(hitRegInfo); return getDataTable(list); } + /** * 学生查询报名信息列表 */ @GetMapping("/studentList") - public TableDataInfo studentList(HitRegInfo hitRegInfo) - { + public TableDataInfo studentList(HitRegInfo hitRegInfo) { List list = hitRegInfoService.selectStudentHitRegInfoList(hitRegInfo); return getDataTable(list); @@ -74,8 +75,7 @@ public class HitRegInfoController extends BaseController @Log(title = "报名信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, HitRegInfo hitRegInfo) - { + public void export(HttpServletResponse response, HitRegInfo hitRegInfo) { List list = hitRegInfoService.selectHitRegInfoListExport(hitRegInfo); List list1 = new ArrayList<>(); for (HitRegInfo hitRegInfo1 : list) { @@ -105,7 +105,7 @@ public class HitRegInfoController extends BaseController hitRegInfoExportVo.setCreateTime(formattedCreateTime); list1.add(hitRegInfoExportVo); - }catch (Exception e) { + } catch (Exception e) { log.error("导出错误,团队信息:{}", hitRegInfo1); log.error("导出错误,错误信息:{}", e.getMessage()); } @@ -119,8 +119,7 @@ public class HitRegInfoController extends BaseController * 管理员修改战队信息 */ @PutMapping("/editTeam") - public AjaxResult editTeam(@RequestBody HitRegInfo hitRegInfo) - { + public AjaxResult editTeam(@RequestBody HitRegInfo hitRegInfo) { return toAjax(hitRegInfoService.editTeam(hitRegInfo)); } @@ -130,8 +129,7 @@ public class HitRegInfoController extends BaseController */ @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(hitRegInfoService.selectHitRegInfoById(id)); } @@ -141,8 +139,7 @@ public class HitRegInfoController extends BaseController @Log(title = "报名信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody HitRegInfo hitRegInfo) - { + public AjaxResult add(@RequestBody HitRegInfo hitRegInfo) { return toAjax(hitRegInfoService.insertHitRegInfo(hitRegInfo)); } @@ -152,37 +149,36 @@ public class HitRegInfoController extends BaseController @Log(title = "报名信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody HitRegInfo hitRegInfo) - { + public AjaxResult edit(@RequestBody HitRegInfo hitRegInfo) { return toAjax(hitRegInfoService.updateHitRegInfo(hitRegInfo)); } + /** * 修改报名信息 */ @Log(title = "报名信息", businessType = BusinessType.UPDATE) @PutMapping("/studentEdit") - public AjaxResult studentEdit(@RequestBody HitRegInfo hitRegInfo) - { + public AjaxResult studentEdit(@RequestBody HitRegInfo hitRegInfo) { return toAjax(hitRegInfoService.studentEdit(hitRegInfo)); } + /** * 修改报名信息 */ @Log(title = "报名信息", businessType = BusinessType.UPDATE) @PutMapping("/edit2") - public AjaxResult edit2(@RequestBody HitRegInfo hitRegInfo) - { + public AjaxResult edit2(@RequestBody HitRegInfo hitRegInfo) { return toAjax(hitRegInfoService.updateHitRegInfo(hitRegInfo)); } + /** * 删除报名信息 */ @Log(title = "报名信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(hitRegInfoService.deleteHitRegInfoByIds(ids)); } @@ -199,6 +195,7 @@ public class HitRegInfoController extends BaseController /** * 导入个人分数数据 + * * @param file * @return * @throws Exception @@ -224,6 +221,7 @@ public class HitRegInfoController extends BaseController /** * 导入团队分数数据 + * * @param file * @return * @throws Exception @@ -235,4 +233,21 @@ public class HitRegInfoController extends BaseController String message = hitRegInfoService.importTeamData(hitList); return success(message); } + + /** + * 查询用户是否已报名 + * + * @param hitRegInfo + * @return + */ + @GetMapping("/queryIfReg") + public AjaxResult queryIfReg(HitRegInfo hitRegInfo) { + if (hitRegInfo.getYear() == null) { + hitRegInfo.setYear(String.valueOf(Year.now().getValue())); + } + // 设置用户id + hitRegInfo.setUserId(getUserId()); + HitRegInfo hitRegInfo1 = hitRegInfoService.selectHitByUserIdAndRacetrack(hitRegInfo); + return success(hitRegInfo1); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoUserController.java index 9399395..3a4264b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoUserController.java @@ -1,8 +1,10 @@ package com.ruoyi.cms.controller; +import java.time.Year; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.cms.domain.HitRegInfo; import com.ruoyi.cms.domain.HitRegInfoUser; import com.ruoyi.cms.service.IHitRegInfoUserService; import org.springframework.security.access.prepost.PreAuthorize; @@ -31,8 +33,7 @@ import com.ruoyi.common.core.page.TableDataInfo; */ @RestController @RequestMapping("/system/hitRegUser") -public class HitRegInfoUserController extends BaseController -{ +public class HitRegInfoUserController extends BaseController { @Autowired private IHitRegInfoUserService hitRegInfoUserService; @@ -41,8 +42,7 @@ public class HitRegInfoUserController extends BaseController */ @GetMapping("/list") - public TableDataInfo list(HitRegInfoUser hitRegInfoUser) - { + public TableDataInfo list(HitRegInfoUser hitRegInfoUser) { startPage(); List list = hitRegInfoUserService.selectHitRegInfoUserList(hitRegInfoUser); return getDataTable(list); @@ -54,8 +54,7 @@ public class HitRegInfoUserController extends BaseController @Log(title = "报名相关人员信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, HitRegInfoUser hitRegInfoUser) - { + public void export(HttpServletResponse response, HitRegInfoUser hitRegInfoUser) { List list = hitRegInfoUserService.selectHitRegInfoUserList(hitRegInfoUser); ExcelUtil util = new ExcelUtil(HitRegInfoUser.class); util.exportExcel(response, list, "报名相关人员信息数据"); @@ -66,8 +65,7 @@ public class HitRegInfoUserController extends BaseController */ @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(hitRegInfoUserService.selectHitRegInfoUserById(id)); } @@ -77,8 +75,7 @@ public class HitRegInfoUserController extends BaseController @Log(title = "报名相关人员信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody HitRegInfoUser hitRegInfoUser) - { + public AjaxResult add(@RequestBody HitRegInfoUser hitRegInfoUser) { return toAjax(hitRegInfoUserService.insertHitRegInfoUser(hitRegInfoUser)); } @@ -87,8 +84,7 @@ public class HitRegInfoUserController extends BaseController */ @Log(title = "报名相关人员信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody HitRegInfoUser hitRegInfoUser) - { + public AjaxResult edit(@RequestBody HitRegInfoUser hitRegInfoUser) { return toAjax(hitRegInfoUserService.updateHitRegInfoUser(hitRegInfoUser)); } @@ -97,9 +93,8 @@ public class HitRegInfoUserController extends BaseController */ @Log(title = "报名相关人员信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(hitRegInfoUserService.deleteHitRegInfoUserByIds(ids)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java index c972498..40c902f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java @@ -1,14 +1,18 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.core.domain.entity.SysDictData; 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; +import java.util.List; + /** * 基础信息对象 base_info - * + * * @author 点亮信息 * @date 2024-07-26 */ @@ -54,4 +58,10 @@ public class BaseInfo extends BaseEntity /** 技术支持手机号 */ @Excel(name = "技术支持手机号") private String technologyNumber; + + /** + * 字典数据(赛道信息) + */ + @TableField(exist = false) + private List dictDatas; } 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 index 7159e62..4f6e42e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java @@ -91,7 +91,7 @@ public class HitCompetitionStudentInfo implements Serializable { @ApiModelProperty(value = "学生证") private String studentIdCard; - @Excel(name = "个人选拔赛分数",type = IMPORT) + @Excel(name = "个人选拔赛分数") @ApiModelProperty(value = "个人选拔赛分数") private BigDecimal trialsScore; // @Excel(name = "是否被选为参加地区选拔赛人员", readConverterExp = "false=待审核,true=已入选",type = EXPORT) 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 b5ec383..9b50f50 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 @@ -99,6 +99,8 @@ public class HitRegInfo extends BaseEntity private List studentUserss =new ArrayList<>(); @TableField(exist = false) private String year; + @TableField(exist = false) + private Long userId; } 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 index 3fa36df..c60fdb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitCompetitionStudentInfoMapper.java @@ -26,6 +26,7 @@ public interface HitCompetitionStudentInfoMapper extends BaseMapper public int deleteHitRegInfoByIds(Long[] ids); HitRegInfo selectHitByUserId(@Param("userId") Long userId,@Param("status") String status,@Param("year") String year); HitRegInfo selectHitByUserId2(@Param("userId") Long userId,@Param("year") String year); + HitRegInfo selectHitByUserIdAndRacetrack(@Param("userId") Long userId,@Param("year") String year, @Param("racetrack") String racetrack); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java index 39558d6..57d34b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java @@ -77,6 +77,8 @@ public interface IHitRegInfoService { HitRegInfo selectHitByUserId2(Long userId); + HitRegInfo selectHitByUserId2(Long userId, String racetrack); + List selectStudentHitRegInfoList(HitRegInfo hitRegInfo); @@ -105,4 +107,12 @@ public interface IHitRegInfoService { * @return */ String importTeamData(List hitList); + + + /** + * 查询团队信息 + * @param hitRegInfo + * @return + */ + HitRegInfo selectHitByUserIdAndRacetrack(HitRegInfo hitRegInfo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java index d7f61aa..c9437ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java @@ -4,6 +4,8 @@ import java.util.List; import cn.hutool.core.lang.Snowflake; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.cms.mapper.BaseInfoMapper; @@ -12,7 +14,7 @@ import com.ruoyi.cms.service.IBaseInfoService; /** * 基础信息Service业务层处理 - * + * * @author 点亮信息 * @date 2024-07-26 */ @@ -21,10 +23,12 @@ public class BaseInfoServiceImpl extends ServiceImpl i { @Autowired private Snowflake snowflake; + @Autowired + private ISysDictDataService sysDictDataService; /** * 修改基础信息 - * + * * @param baseInfo 基础信息 * @return 结果 */ @@ -39,7 +43,12 @@ public class BaseInfoServiceImpl extends ServiceImpl i */ @Override public BaseInfo getBaseInfo(){ - return baseMapper.selectBaseInfo(); + SysDictData sysDictData = new SysDictData(); + sysDictData.setDictType("com_racetrack"); + List sysDictDatas = sysDictDataService.selectDictDataList(sysDictData); + BaseInfo baseInfo = baseMapper.selectBaseInfo(); + baseInfo.setDictDatas(sysDictDatas); + return baseInfo; } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java index 7155e4f..046cebe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java @@ -121,7 +121,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService { break; } case "1": - HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear()); + HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserIdAndRacetrack(regInfoUser.getUserId(), hitRegInfo.getYear(),regInfo.getRacetrack()); regInfo.getStudentUserss().add(studentInfo); break; } @@ -167,7 +167,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService { break; } case "1": - HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear()); + HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserIdAndRacetrack(regInfoUser.getUserId(), hitRegInfo.getYear(), regInfo.getRacetrack()); regInfo.getStudentUserss().add(studentInfo); break; } @@ -397,6 +397,20 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService { return hitRegInfo; } + @Override + public HitRegInfo selectHitByUserId2(Long userId, String racetrack) { + Calendar calendar = Calendar.getInstance(); + int year = calendar.get(Calendar.YEAR); + HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserIdAndRacetrack(userId, String.valueOf(year),racetrack); + if (ObjectUtils.isNotEmpty(hitRegInfo)) { + HitRegInfoUser hitRegInfoUser = new HitRegInfoUser(); + hitRegInfoUser.setRegId(hitRegInfo.getId()); + List hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser); + hitRegInfo.setRegInfoUsers(hitRegInfoUsers); + } + return hitRegInfo; + } + @Override public List selectStudentHitRegInfoList(HitRegInfo hitRegInfo) { if (ObjectUtil.isEmpty(hitRegInfo.getYear())) { @@ -577,6 +591,17 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService { return "导入完成"; } + /** + * 查询团队信息 + * + * @param hitRegInfo + * @return + */ + @Override + public HitRegInfo selectHitByUserIdAndRacetrack(HitRegInfo hitRegInfo) { + return hitRegInfoMapper.selectHitByUserIdAndRacetrack(hitRegInfo.getUserId(), hitRegInfo.getYear(), hitRegInfo.getRacetrack()); + } + /** * 更新队员信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java index 0ac5408..1b78695 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java @@ -79,11 +79,11 @@ public class HitTeamsServiceImpl extends ServiceImpl i if (preliminary.getTeammateOne().equals(preliminary.getTeammateTwo())) { throw new Exception("队员不可重复"); } - HitRegInfo hitRegInfo1 = regInfoService.selectHitByUserId2(preliminary.getTeammateOne()); + HitRegInfo hitRegInfo1 = regInfoService.selectHitByUserId2(preliminary.getTeammateOne(),preliminary.getRacetrack()); if (ObjectUtils.isNotEmpty(hitRegInfo1)) { throw new Exception("队员1已存在组队信息，不可重复组队"); } - HitRegInfo hitRegInfo2 = regInfoService.selectHitByUserId2(preliminary.getTeammateTwo()); + HitRegInfo hitRegInfo2 = regInfoService.selectHitByUserId2(preliminary.getTeammateTwo(),preliminary.getRacetrack()); if (ObjectUtils.isNotEmpty(hitRegInfo2)) { throw new Exception("队员2已存在组队信息，不可重复组队"); } @@ -103,7 +103,9 @@ public class HitTeamsServiceImpl extends ServiceImpl i hitRegInfo.setSampleConcat(preliminary.getSampleConcat()); hitRegInfo.setSampleNumber(preliminary.getSampleNumber()); hitRegInfo.setUploadFile(preliminary.getUploadFile()); - hitRegInfo.setAuditStatus("9"); +// hitRegInfo.setAuditStatus("9"); + // 修改为只需要领队老师审核 + hitRegInfo.setAuditStatus("0"); hitRegInfo.setCreateTime(new Date()); log.info("插入数据：" + hitRegInfo); hitRegInfo.setCompetition(preliminary.getCompetition()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 59becaf..b5b1ca1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -27,7 +27,7 @@ import com.ruoyi.system.service.ISysDictTypeService; /** * 数据字典信息 - * + * * @author ruoyi */ @RestController @@ -106,6 +106,13 @@ public class SysDictDataController extends BaseController dict.setUpdateBy(getUsername()); return toAjax(dictDataService.updateDictData(dict)); } + @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @PutMapping("/byDictType") + public AjaxResult editByDictType( @RequestBody SysDictData dict) + { + dict.setUpdateBy(getUsername()); + return toAjax(dictDataService.updateDictDataByDictType(dict)); + } /** * 删除字典类型 diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml index 52b682e..3ac4f09 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml @@ -75,6 +75,19 @@ AND hcsi.create_time LIKE concat(#{year}, '%') AND hu.create_time LIKE concat(#{year}, '%') + insert into hit_competition_student_info diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml index b81ebc0..b5a87cb 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml @@ -57,12 +57,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT DISTINCT hri.* from hit_reg_info hri LEFT JOIN hit_reg_info_user hriu on hri.id = hriu.reg_id WHERE user_id = #{userId} and hri.audit_status= #{status} and hri.create_time like concat(#{year},'%') + limit 1 + insert into hit_reg_info diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index a283288..729dd25 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -116,7 +116,7 @@ public class SecurityConfig .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/api/**", "/ueditor/**","/system/dict/data/type/sys_user_sex","/system/dict/data/type/imitation_type" - ,"/system/dict/data/type/school_name","/system/dict/data/type/com_region").permitAll() + ,"/system/dict/data/type/school_name","/system/dict/data/type/com_region","/system/dict/data/type/com_racetrack","/system/dict/data/type/com_nationality").permitAll() .antMatchers("/system/hit_stu_info/*").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index bb9bb0a..7625898 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -6,14 +6,14 @@ import com.ruoyi.common.core.domain.entity.SysDictData; /** * 字典表 数据层 - * + * * @author ruoyi */ public interface SysDictDataMapper { /** * 根据条件分页查询字典数据 - * + * * @param dictData 字典数据信息 * @return 字典数据集合信息 */ @@ -21,7 +21,7 @@ public interface SysDictDataMapper /** * 根据字典类型查询字典数据 - * + * * @param dictType 字典类型 * @return 字典数据集合信息 */ @@ -29,7 +29,7 @@ public interface SysDictDataMapper /** * 根据字典类型和字典键值查询字典数据信息 - * + * * @param dictType 字典类型 * @param dictValue 字典键值 * @return 字典标签 @@ -38,7 +38,7 @@ public interface SysDictDataMapper /** * 根据字典数据ID查询信息 - * + * * @param dictCode 字典数据ID * @return 字典数据 */ @@ -46,7 +46,7 @@ public interface SysDictDataMapper /** * 查询字典数据 - * + * * @param dictType 字典类型 * @return 字典数据 */ @@ -54,7 +54,7 @@ public interface SysDictDataMapper /** * 通过字典ID删除字典数据信息 - * + * * @param dictCode 字典数据ID * @return 结果 */ @@ -62,7 +62,7 @@ public interface SysDictDataMapper /** * 批量删除字典数据信息 - * + * * @param dictCodes 需要删除的字典数据ID * @return 结果 */ @@ -70,7 +70,7 @@ public interface SysDictDataMapper /** * 新增字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ @@ -78,7 +78,7 @@ public interface SysDictDataMapper /** * 修改字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ @@ -86,7 +86,7 @@ public interface SysDictDataMapper /** * 同步修改字典类型 - * + * * @param oldDictType 旧字典类型 * @param newDictType 新旧字典类型 * @return 结果 @@ -94,4 +94,7 @@ public interface SysDictDataMapper public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); int insertBatchDictData(@Param("dictDatas") List dictDatas); + + + int updateDictDataByDictType(SysDictData dict); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index d521fc6..7163400 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -5,14 +5,14 @@ import com.ruoyi.common.core.domain.entity.SysDictData; /** * 字典 业务层 - * + * * @author ruoyi */ public interface ISysDictDataService { /** * 根据条件分页查询字典数据 - * + * * @param dictData 字典数据信息 * @return 字典数据集合信息 */ @@ -20,7 +20,7 @@ public interface ISysDictDataService /** * 根据字典类型和字典键值查询字典数据信息 - * + * * @param dictType 字典类型 * @param dictValue 字典键值 * @return 字典标签 @@ -29,7 +29,7 @@ public interface ISysDictDataService /** * 根据字典数据ID查询信息 - * + * * @param dictCode 字典数据ID * @return 字典数据 */ @@ -37,14 +37,14 @@ public interface ISysDictDataService /** * 批量删除字典数据信息 - * + * * @param dictCodes 需要删除的字典数据ID */ public void deleteDictDataByIds(Long[] dictCodes); /** * 新增保存字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ @@ -60,9 +60,16 @@ public interface ISysDictDataService /** * 修改保存字典数据信息 - * + * * @param dictData 字典数据信息 * @return 结果 */ public int updateDictData(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * @param dict + * @return + */ + int updateDictDataByDictType(SysDictData dict); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index ea85c48..e3b56be 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -10,7 +10,7 @@ import com.ruoyi.system.service.ISysDictDataService; /** * 字典 业务层处理 - * + * * @author ruoyi */ @Service @@ -21,7 +21,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 根据条件分页查询字典数据 - * + * * @param dictData 字典数据信息 * @return 字典数据集合信息 */ @@ -33,7 +33,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 根据字典类型和字典键值查询字典数据信息 - * + * * @param dictType 字典类型 * @param dictValue 字典键值 * @return 字典标签 @@ -46,7 +46,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 根据字典数据ID查询信息 - * + * * @param dictCode 字典数据ID * @return 字典数据 */ @@ -58,7 +58,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 批量删除字典数据信息 - * + * * @param dictCodes 需要删除的字典数据ID */ @Override @@ -75,7 +75,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 新增保存字典数据信息 - * + * * @param data 字典数据信息 * @return 结果 */ @@ -105,7 +105,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService /** * 修改保存字典数据信息 - * + * * @param data 字典数据信息 * @return 结果 */ @@ -120,4 +120,21 @@ public class SysDictDataServiceImpl implements ISysDictDataService } return row; } + + /** + * 根据字典类型查询字典数据 + * + * @param dict + * @return + */ + @Override + public int updateDictDataByDictType(SysDictData dict) { + int row = dictDataMapper.updateDictDataByDictType(dict); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); + DictUtils.setDictCache(dict.getDictType(), dictDatas); + } + return row; + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 67d582a..9d0219f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark from sys_dict_data @@ -40,37 +40,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - + - + - + - + - + delete from sys_dict_data where dict_code = #{dictCode} - + delete from sys_dict_data where dict_code in #{dictCode} - + - + update sys_dict_data @@ -88,12 +88,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_code = #{dictCode} - + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_type = #{dictType} AND dict_value = #{dictValue} + + + insert into sys_dict_data( dict_sort, dict_label, @@ -146,4 +163,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml index 67d582a..9d0219f 100644 --- a/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark from sys_dict_data @@ -40,37 +40,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - + - + - + - + - + delete from sys_dict_data where dict_code = #{dictCode} - + delete from sys_dict_data where dict_code in #{dictCode} - + - + update sys_dict_data @@ -88,12 +88,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_code = #{dictCode} - + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - - + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_type = #{dictType} AND dict_value = #{dictValue} + + + insert into sys_dict_data( dict_sort, dict_label, @@ -146,4 +163,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-ui/src/api/cms/baseInfo.js b/ruoyi-ui/src/api/cms/baseInfo.js index 4528fa4..afa47b2 100644 --- a/ruoyi-ui/src/api/cms/baseInfo.js +++ b/ruoyi-ui/src/api/cms/baseInfo.js @@ -47,3 +47,10 @@ export function editStatus(status){ url: "/cms/baseInfo/updateRegister?status=" + status, }) } +export function editRegister(data){ + return request({ + url: "/system/dict/data/byDictType", + method: "put", + data: data, + }) +} diff --git a/ruoyi-ui/src/api/officialWebsite/registerStudent.js b/ruoyi-ui/src/api/officialWebsite/registerStudent.js index a903830..ab78048 100644 --- a/ruoyi-ui/src/api/officialWebsite/registerStudent.js +++ b/ruoyi-ui/src/api/officialWebsite/registerStudent.js @@ -127,3 +127,10 @@ export function updateRegInfo(data) { data: data }) } +export function queryIfReg(data) { + return request({ + url: '/system/hit_reg_info/queryIfReg', + method: 'get', + params: data + }) +} diff --git a/ruoyi-ui/src/assets/images/teamReg.png b/ruoyi-ui/src/assets/images/teamReg.png new file mode 100644 index 0000000000000000000000000000000000000000..00f8d97490877df640e5a30f2e356de4ba52b2c0 GIT binary patch literal 4892 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 b1ONdL_gHzA*L + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + 化验赛 + 虚拟赛 + + +
+ + +
+ + + + + + + +
+ + +
+ + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+ + +
+ + + + + + + +
+ + + + + + + + + + + + + + 提交 + 重置 + + + + + + + diff --git a/ruoyi-ui/src/components/select/select.vue b/ruoyi-ui/src/components/select/select.vue new file mode 100644 index 0000000..c123e4b --- /dev/null +++ b/ruoyi-ui/src/components/select/select.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue index 41c7b42..be017c9 100644 --- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue +++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue @@ -91,6 +91,12 @@ > + + + + @@ -167,6 +173,13 @@ {{ props.row.createTime.substring(0, 10) }} + + +