dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新9.19

Browse Source
This commit is contained in:
许允枞 2024-09-19 10:24:20 +08:00
parent 128667a085
commit d055702fa7
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java
View File

@ -104,6 +104,7 @@ public class HitCompetitionStudentInfo implements Serializable {
@ApiModelProperty(value = "逻辑删除 0未删除 1真删除")
private Boolean delFlag;
@Excel(name = "报名时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间（默认时间当前）")
@TableField(fill = FieldFill.INSERT)
private Date createTime;

10
ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
View File

@ -130,6 +130,16 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
@Override
public int insertHitCompetitionStudentInfo(HitCompetitionStudentInfo hitCompetitionStudentInfo)
{
//判断是否重复报名
LambdaQueryWrapper<HitCompetitionStudentInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(HitCompetitionStudentInfo::getStudentId, hitCompetitionStudentInfo.getStudentId());
DateTime now = DateUtil.date();
queryWrapper.between(HitCompetitionStudentInfo::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now));
queryWrapper.eq(HitCompetitionStudentInfo::getDelFlag, false);
List<HitCompetitionStudentInfo> hitCompetitionStudentInfos = hitCompetitionStudentInfoMapper.selectList(queryWrapper);
if (CollectionUtil.isNotEmpty(hitCompetitionStudentInfos)) {
throw new RuntimeException("请勿重复报名！");
}
hitCompetitionStudentInfo.setCreateTime(DateUtils.getNowDate());
SysUser user = SecurityUtils.getLoginUser().getUser();
hitCompetitionStudentInfo.setUserId(user.getUserId());

2
ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java
View File

@ -169,6 +169,8 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac
@Override
@Transactional(rollbackFor = Exception.class)
public void register(RegisterBody user) throws Exception {
//删除学校名称的空格
user.getHitRegistrationTeachInfo().setSchoolName(user.getHitRegistrationTeachInfo().getSchoolName().trim());
String msg = "", username = user.getUsername(), password = user.getPassword();
SysUser sysUser = new SysUser();
sysUser.setUserName(username);