From ff6d7cb24f98212f944a83c2e2428b788f3accfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Tue, 11 Feb 2025 17:56:19 +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 --- .../HitCompetitionStudentInfoController.java | 76 ++-- .../java/com/ruoyi/cms/domain/HitRegInfo.java | 2 + .../HitCompetitionStudentInfoMapper.java | 4 +- .../HitRegistrationTeachInfoMapper.java | 2 +- .../IHitCompetitionStudentInfoService.java | 15 + .../service/impl/CmsCategoryServiceImpl.java | 7 +- .../HitCompetitionStudentInfoServiceImpl.java | 137 ++++--- .../service/impl/HitRegInfoServiceImpl.java | 38 +- .../HitRegistrationTeachInfoServiceImpl.java | 55 +-- .../cms/HitCompetitionStudentInfoMapper.xml | 6 +- .../resources/mapper/cms/HitRegInfoMapper.xml | 1 + .../cms/HitRegistrationTeachInfoMapper.xml | 2 +- .../classes/mapper/cms/CmsContentMapper.xml | 379 ------------------ .../web/service/SysLoginService.java | 16 + ruoyi-ui/public/index.html | 2 +- ruoyi-ui/public/logo.png | Bin 0 -> 3961 bytes ruoyi-ui/src/api/hit/competitionEdit.js | 18 + .../hit/registrationStudentInfo/index.vue | 122 +++--- ruoyi-ui/src/views/hit/stuInfo/index.vue | 32 +- .../views/hit/studentEdit/competitionEdit.vue | 167 ++++++++ .../src/views/officialWebsite/competition.vue | 12 +- .../src/views/officialWebsite/platform.vue | 27 +- .../src/views/officialWebsite/teaching.vue | 6 +- 23 files changed, 526 insertions(+), 600 deletions(-) delete mode 100644 ruoyi-admin/target/classes/mapper/cms/CmsContentMapper.xml create mode 100644 ruoyi-ui/public/logo.png create mode 100644 ruoyi-ui/src/api/hit/competitionEdit.js create mode 100644 ruoyi-ui/src/views/hit/studentEdit/competitionEdit.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java index 62fa4f5..378d707 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java @@ -2,6 +2,7 @@ package com.ruoyi.cms.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.cms.domain.vo.HitCompetitionStudentInfoImportVo; import com.ruoyi.common.annotation.Log; @@ -58,8 +59,7 @@ public class HitCompetitionStudentInfoController extends BaseController { */ @GetMapping("/list") - public TableDataInfo list(HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public TableDataInfo list(HitCompetitionStudentInfo hitCompetitionStudentInfo) { startPage(); List list = hitCompetitionStudentInfoService.selectHitCompetitionStudentInfoList(hitCompetitionStudentInfo); return getDataTable(list); @@ -71,8 +71,7 @@ public class HitCompetitionStudentInfoController extends BaseController { @Log(title = "大赛学生", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public void export(HttpServletResponse response, HitCompetitionStudentInfo hitCompetitionStudentInfo) { List list = hitCompetitionStudentInfoService.selectHitCompetitionStudentInfoListExport(hitCompetitionStudentInfo); ExcelUtil util = new ExcelUtil(HitCompetitionStudentInfo.class); util.exportExcel(response, list, "大赛学生数据"); @@ -82,8 +81,7 @@ public class HitCompetitionStudentInfoController extends BaseController { * 获取大赛学生详细信息 */ @GetMapping(value = "/byId/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return success(hitCompetitionStudentInfoService.selectHitCompetitionStudentInfoById(id)); } @@ -93,8 +91,7 @@ public class HitCompetitionStudentInfoController extends BaseController { @Log(title = "大赛学生", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public AjaxResult add(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) { return toAjax(hitCompetitionStudentInfoService.insertHitCompetitionStudentInfo(hitCompetitionStudentInfo)); } @@ -104,18 +101,17 @@ public class HitCompetitionStudentInfoController extends BaseController { @Log(title = "大赛学生", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public AjaxResult edit(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) { return toAjax(hitCompetitionStudentInfoService.updateHitCompetitionStudentInfo(hitCompetitionStudentInfo)); } + /** * 修改大赛学生编辑 */ @Log(title = "大赛学生", businessType = BusinessType.UPDATE) @PutMapping("editInfo") - public AjaxResult editInfo(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public AjaxResult editInfo(@RequestBody HitCompetitionStudentInfo hitCompetitionStudentInfo) { return toAjax(hitCompetitionStudentInfoService.updateHitCompetitionStudentInfoUpdate(hitCompetitionStudentInfo)); } @@ -125,60 +121,65 @@ public class HitCompetitionStudentInfoController extends BaseController { @Log(title = "大赛学生", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { + public AjaxResult remove(@PathVariable String[] ids) { return toAjax(hitCompetitionStudentInfoService.deleteHitCompetitionStudentInfoByIds(ids)); } + /** * 根据学号查询学生信息 + * * @param studentId * @return */ @GetMapping("/{studentId}") - public AjaxResult getStudentInfoByStuId(@PathVariable("studentId") String studentId){ + public AjaxResult getStudentInfoByStuId(@PathVariable("studentId") String studentId) { return success(hitCompetitionStudentInfoService.selectHitCompetitionStudentInfoByStuId(studentId)); } /** * 获取当前用户信息 + * * @return */ @GetMapping("/getStudentInfo") - public AjaxResult getStudentInfo(){ + public AjaxResult getStudentInfo() { return success(hitCompetitionStudentInfoService.getStudentInfo()); } + /** * 根据学校及赛区查询队友信息 + * * @param schoolName division */ - @GetMapping( "/getTeamMateInfo") - public AjaxResult getTeamMateBySchoolNameAndDivision(@RequestParam String schoolName,@RequestParam String division) { + @GetMapping("/getTeamMateInfo") + public AjaxResult getTeamMateBySchoolNameAndDivision(@RequestParam String schoolName, @RequestParam String division) { return success(hitCompetitionStudentInfoService.selectTeamMateBySchoolNameAndDivision(schoolName, division)); } /** * 查询当前用户是否有队伍 + * * @return teamId * @return teamName * @return teamMateId */ @GetMapping("/getTeam") - public AjaxResult getTeamMateInfoByStuId(){ + public AjaxResult getTeamMateInfoByStuId() { return AjaxResult.success(hitCompetitionStudentInfoService.selectTeamMateInfoByStuId()); } @Log(title = "修改个人赛时间", businessType = BusinessType.UPDATE) @PutMapping("/updateTime") - public AjaxResult updateTime(@RequestBody LocalDateTime time) { - System.out.println("接收到的时间"+time); + public AjaxResult updateTime(@RequestBody LocalDateTime time) { + System.out.println("接收到的时间" + time); SysJob job = new SysJob(); job.setInvokeTarget("hitTask.scheduleTask"); //将time转化为cron表达式，包含年 job.setRemark("修改个人赛时间"); job.setStatus("0"); job.setJobId(4L); - job.setCronExpression("0 "+time.getSecond()+" "+time.getMinute()+" "+time.getHour()+" * * ?"); + job.setCronExpression("0 " + time.getSecond() + " " + time.getMinute() + " " + time.getHour() + " * * ?"); try { sysJobController.edit(job); } catch (SchedulerException e) { @@ -191,18 +192,17 @@ public class HitCompetitionStudentInfoController extends BaseController { /** * 导入个人分数数据模板 + * * @param response */ @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) - { + public void importTemplate(HttpServletResponse response) { ExcelUtil util = new ExcelUtil<>(HitCompetitionStudentInfoImportVo.class); util.importTemplateExcel(response, "用户数据"); } @PostMapping("/importData") - public AjaxResult importData(MultipartFile file) throws Exception - { + public AjaxResult importData(MultipartFile file) throws Exception { ExcelUtil util = new ExcelUtil<>(HitCompetitionStudentInfoImportVo.class); List hitList = util.importExcel(file.getInputStream()); String message = hitCompetitionStudentInfoService.importData(hitList); @@ -210,9 +210,8 @@ public class HitCompetitionStudentInfoController extends BaseController { } @PostMapping("/uploadDsFile") - public AjaxResult importDsFile(@RequestParam("file")MultipartFile file,String phoneNumber){ - try - { + public AjaxResult importDsFile(@RequestParam("file") MultipartFile file, String phoneNumber) { + try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 @@ -231,10 +230,23 @@ public class HitCompetitionStudentInfoController extends BaseController { } return success("上传失败"); - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } + + /** + * 查询大赛学生信息 + * + * @param info 请求参数 + * @return + */ + @GetMapping("/queryStudentInfo") + public AjaxResult queryStudentInfo(HitCompetitionStudentInfo info) { + info.setUserId(getUserId()); + if (ObjectUtil.isEmpty(info.getYear())) { + info.setYear(DateUtil.format(DateUtil.date(), "yyyy")); + } + return success(hitCompetitionStudentInfoService.selectHitCompetitionStudentInfo(info)); + } } 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 88c1741..d337dd0 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 @@ -89,6 +89,8 @@ public class HitRegInfo extends BaseEntity private HitRegistrationTeachInfo ldTeacher; @TableField(exist = false) private List studentUserss =new ArrayList<>(); + @TableField(exist = false) + private String year; } 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 9f03eec..3fa36df 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 @@ -3,6 +3,7 @@ package com.ruoyi.cms.mapper; import com.ruoyi.cms.domain.HitCompetitionStudentInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,7 +25,7 @@ public interface HitCompetitionStudentInfoMapper extends BaseMapper selectHitCompetitionStudentInfoList(HitCompetitionStudentInfo hitCompetitionStudentInfo); + /** * 导出查询大赛学生列表 * @@ -55,6 +56,7 @@ public interface IHitCompetitionStudentInfoService extends IService hitList); + + /** + * 查询学生大赛报名信息 + * + * @param info 请求参数 + * @return + */ + HitCompetitionStudentInfo selectHitCompetitionStudentInfo(HitCompetitionStudentInfo info); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java index 0556b86..c4ad94c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java @@ -215,7 +215,6 @@ public class CmsCategoryServiceImpl extends ServiceImpl selectCmsCategoryAndContentTreeList(CmsCategoryQuery categoryQuery) { @@ -287,7 +286,7 @@ public class CmsCategoryServiceImpl extends ServiceImpl getLeavesContentList(Long id){ + public List getLeavesContentList(Long id) { return contentMapper.selectList(new QueryWrapper().and(item -> { item.eq("category_id", id) .eq("del_flag", 0); @@ -298,7 +297,7 @@ public class CmsCategoryServiceImpl extends ServiceImpl getCategoryIdByParentId(Long id){ - return baseMapper.selectList(new QueryWrapper().eq("parent_id", id).orderByAsc("category_sort")); + public List getCategoryIdByParentId(Long id) { + return baseMapper.selectList(new QueryWrapper().eq("parent_id", id).eq("is_disable", 0).eq("del_flag", 0).orderByAsc("category_sort")); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java index 7076b40..1d6b684 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java @@ -66,8 +66,6 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl selectHitCompetitionStudentInfoList(HitCompetitionStudentInfo hitCompetitionStudentInfo) - { - Calendar calendar = Calendar.getInstance(); - int year = calendar.get(Calendar.YEAR); - hitCompetitionStudentInfo.setYear(String.valueOf(year)); + public List selectHitCompetitionStudentInfoList(HitCompetitionStudentInfo hitCompetitionStudentInfo) { + if (StringUtils.isEmpty(hitCompetitionStudentInfo.getYear())) { + Calendar calendar = Calendar.getInstance(); + int year = calendar.get(Calendar.YEAR); + hitCompetitionStudentInfo.setYear(String.valueOf(year)); + } //当前教师的学校 LoginUser loginUser = SecurityUtils.getLoginUser(); - HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId()); - if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)&&hitRegistrationTeachInfo.getStatus().equals("1")){ + HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId(), hitCompetitionStudentInfo.getYear()); + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo) && hitRegistrationTeachInfo.getStatus().equals("1")) { hitCompetitionStudentInfo.setSchoolName(hitRegistrationTeachInfo.getSchoolName()); } PageUtils.startPage(); return hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoList(hitCompetitionStudentInfo); } + /** * 查询大赛学生列表 * @@ -108,15 +107,14 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl selectHitCompetitionStudentInfoListExport(HitCompetitionStudentInfo hitCompetitionStudentInfo) - { + public List selectHitCompetitionStudentInfoListExport(HitCompetitionStudentInfo hitCompetitionStudentInfo) { Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); hitCompetitionStudentInfo.setYear(String.valueOf(year)); //当前教师的学校 LoginUser loginUser = SecurityUtils.getLoginUser(); - HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId()); - if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)&&hitRegistrationTeachInfo.getStatus().equals("1")){ + HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId(), hitCompetitionStudentInfo.getYear()); + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo) && hitRegistrationTeachInfo.getStatus().equals("1")) { hitCompetitionStudentInfo.setSchoolName(hitRegistrationTeachInfo.getSchoolName()); } // PageUtils.startPage(); @@ -130,8 +128,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HitCompetitionStudentInfo::getStudentId, hitCompetitionStudentInfo.getStudentId()); @@ -155,17 +152,16 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HitCompetitionStudentInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName()); - queryWrapper.eq(HitCompetitionStudentInfo::getIsPreliminary,true); + queryWrapper.eq(HitCompetitionStudentInfo::getIsPreliminary, true); DateTime now = DateUtil.date(); DateTime dateTime = DateUtil.beginOfYear(now); DateTime dateTime1 = DateUtil.endOfYear(now); queryWrapper.between(HitCompetitionStudentInfo::getCreateTime, dateTime, dateTime1); List hitCompetitionStudentInfos = hitCompetitionStudentInfoMapper.selectList(queryWrapper); - if (CollectionUtil.isNotEmpty(hitCompetitionStudentInfos)&&hitCompetitionStudentInfos.size() >= 15 && hitCompetitionStudentInfo.getIsPreliminary()) { + if (CollectionUtil.isNotEmpty(hitCompetitionStudentInfos) && hitCompetitionStudentInfos.size() >= 15 && hitCompetitionStudentInfo.getIsPreliminary()) { throw new RuntimeException("该学校入选人数已超过15人，无法再添加"); } hitCompetitionStudentInfo.setUpdateTime(DateUtils.getNowDate()); @@ -182,7 +178,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HitCompetitionStudentInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName()); - queryWrapper.eq(HitCompetitionStudentInfo::getIsPreliminary,true); + queryWrapper.eq(HitCompetitionStudentInfo::getIsPreliminary, true); DateTime now = DateUtil.date(); DateTime dateTime = DateUtil.beginOfYear(now); DateTime dateTime1 = DateUtil.endOfYear(now); @@ -198,8 +194,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl queryWrapper1 =new LambdaQueryWrapper<>(); - queryWrapper1.eq(HitRegistrationTeachInfo::getSchoolName,hitCompetitionStudentInfo.getSchoolName()) - .likeRight(HitRegistrationTeachInfo::getCreateTime, year).eq(HitRegistrationTeachInfo::getType,1).eq(HitRegistrationTeachInfo::getStatus,1); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(HitRegistrationTeachInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName()) + .likeRight(HitRegistrationTeachInfo::getCreateTime, year).eq(HitRegistrationTeachInfo::getType, 1).eq(HitRegistrationTeachInfo::getStatus, 1); HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectOne(queryWrapper1); hitCompetitionStudentInfo.setLdTeacherInfo(hitRegistrationTeachInfo); //根绝学校查询 团队成员 把自己排除掉 和 指导老师 - LambdaQueryWrapper queryWrapper2 =new LambdaQueryWrapper<>(); - queryWrapper2.eq(HitRegistrationTeachInfo::getSchoolName,hitCompetitionStudentInfo.getSchoolName()) - .likeRight(HitRegistrationTeachInfo::getCreateTime, year).eq(HitRegistrationTeachInfo::getType,0).eq(HitRegistrationTeachInfo::getStatus,1); + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(HitRegistrationTeachInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName()) + .likeRight(HitRegistrationTeachInfo::getCreateTime, year).eq(HitRegistrationTeachInfo::getType, 0).eq(HitRegistrationTeachInfo::getStatus, 1); List hitRegistrationTeachInfos = hitRegistrationTeachInfoMapper.selectList(queryWrapper2); //领队老师也可以是指导老师 - if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)){ + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)) { hitRegistrationTeachInfos.add(hitRegistrationTeachInfo); } hitCompetitionStudentInfo.setZdTeacherList(hitRegistrationTeachInfos); - LambdaQueryWrapper queryWrapper3 =new LambdaQueryWrapper<>(); - queryWrapper3.eq(HitCompetitionStudentInfo::getSchoolName,hitCompetitionStudentInfo.getSchoolName()).ne(HitCompetitionStudentInfo::getUserId,user.getUserId()) - .likeRight(HitCompetitionStudentInfo::getCreateTime, year).eq(HitCompetitionStudentInfo::getIsPreliminary,1) - .and(it->{ - it.isNull(HitCompetitionStudentInfo::getHitRegId).or().eq(HitCompetitionStudentInfo::getHitRegId,""); + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.eq(HitCompetitionStudentInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName()).ne(HitCompetitionStudentInfo::getUserId, user.getUserId()) + .likeRight(HitCompetitionStudentInfo::getCreateTime, year).eq(HitCompetitionStudentInfo::getIsPreliminary, 1) + .and(it -> { + it.isNull(HitCompetitionStudentInfo::getHitRegId).or().eq(HitCompetitionStudentInfo::getHitRegId, ""); }); List studentInfos = this.list(queryWrapper3); hitCompetitionStudentInfo.setTdStudentList(studentInfos); //查询是否存在已组队团队 HitRegInfo hitRegInfos1 = regInfoService.selectHitByUserId(user.getUserId(), "1"); - String status="-1"; - if (ObjectUtils.isNotEmpty(hitRegInfos1)){ + String status = "-1"; + if (ObjectUtils.isNotEmpty(hitRegInfos1)) { status = "1"; hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos1); List teachers = hitRegInfos1.getRegInfoUsers().stream().filter(it -> { return it.getType().equals("2"); }).collect(Collectors.toList()); - String tmpStr =""; + String tmpStr = ""; for (HitRegInfoUser teacher : teachers) { - tmpStr = teacher.getUserName()+","; + tmpStr = teacher.getUserName() + ","; } - hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0,tmpStr.length()-1)); + hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1)); - }else { + } else { //查询是否存在已确认团队 审核中 HitRegInfo hitRegInfos2 = regInfoService.selectHitByUserId(user.getUserId(), "0"); - if (ObjectUtils.isNotEmpty(hitRegInfos2)){ + if (ObjectUtils.isNotEmpty(hitRegInfos2)) { status = "0"; hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos2); List teachers = hitRegInfos2.getRegInfoUsers().stream().filter(it -> { return it.getType().equals("2"); }).collect(Collectors.toList()); - String tmpStr =""; + String tmpStr = ""; for (HitRegInfoUser teacher : teachers) { - tmpStr = teacher.getUserName()+","; + tmpStr = teacher.getUserName() + ","; } - hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0,tmpStr.length()-1)); - }else { + hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1)); + } else { //查询是否存在待确认团队 HitRegInfo hitRegInfos3 = regInfoService.selectHitByUserId(user.getUserId(), "9"); - if (ObjectUtils.isNotEmpty(hitRegInfos3)){ + if (ObjectUtils.isNotEmpty(hitRegInfos3)) { status = "9"; hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos3); List teachers = hitRegInfos3.getRegInfoUsers().stream().filter(it -> { return it.getType().equals("2"); }).collect(Collectors.toList()); - String tmpStr =""; + String tmpStr = ""; for (HitRegInfoUser teacher : teachers) { - tmpStr =tmpStr+ teacher.getUserName()+","; + tmpStr = tmpStr + teacher.getUserName() + ","; } - hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0,tmpStr.length()-1)); + hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1)); } } } @@ -329,7 +323,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl selectTeamMateBySchoolNameAndDivision(String schoolName, String division) { + public List selectTeamMateBySchoolNameAndDivision(String schoolName, String division) { //获取当前学生信息信息 SysUser user = SecurityUtils.getLoginUser().getUser(); String userName = user.getUserName(); @@ -344,6 +338,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitTeamsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - hitTeamsLambdaQueryWrapper.eq(HitTeamMembers::getTeamMemberId, studentDBId); - teamsVo= selectTeamMsg(teamsVo, hitTeamsLambdaQueryWrapper); + LambdaQueryWrapper hitTeamsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + hitTeamsLambdaQueryWrapper.eq(HitTeamMembers::getTeamMemberId, studentDBId); + teamsVo = selectTeamMsg(teamsVo, hitTeamsLambdaQueryWrapper); } if (userType.equals("02")) { //如果是老师，则查询老师信息 @@ -374,7 +369,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitTeamsLambdaQueryWrapper = new LambdaQueryWrapper<>(); hitTeamsLambdaQueryWrapper.eq(HitTeamMembers::getTeamMemberId, teacherDB.getId()); - teamsVo= selectTeamMsg(teamsVo, hitTeamsLambdaQueryWrapper); + teamsVo = selectTeamMsg(teamsVo, hitTeamsLambdaQueryWrapper); } return teamsVo; } @@ -390,15 +385,13 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl { //判断手机号与分数是否为空 - if (!StringUtils.isNull(item.getPhoneNumber()) || !StringUtils.isNull(item.getTrialsScore())) - { + if (!StringUtils.isNull(item.getPhoneNumber()) || !StringUtils.isNull(item.getTrialsScore())) { //添加trycatch 如果报错继续往下面修改 try { HitCompetitionStudentInfo hitCompetitionStudentInfo = BeanUtil.copyProperties(item, HitCompetitionStudentInfo.class); @@ -408,7 +401,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitTeamsLambdaQueryWrapper) { HitTeamMembers hitTeamMembers = hitTeamMembersMapper.selectOne(hitTeamsLambdaQueryWrapper); - if (hitTeamMembers != null) { + if (hitTeamMembers != null) { teamsVo.setTeamMateId(Long.valueOf(hitTeamMembers.getTeamMemberId())); teamsVo.setTeamId(Long.valueOf(hitTeamMembers.getTeamId())); teamsVo.setIsAgreeWith(String.valueOf(hitTeamMembers.getIsAgreeWith())); 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 f6607f7..9be9f61 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 @@ -4,9 +4,11 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -82,9 +84,13 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService @Override public List selectHitRegInfoList(HitRegInfo hitRegInfo) { + if (ObjectUtil.isEmpty(hitRegInfo.getYear())) { + //获取当前年 + hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy")); + } Long userId = SecurityUtils.getLoginUser().getUserId(); //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队 - HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId); + HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId,hitRegInfo.getYear()); if (teacherInfo != null && teacherInfo.getType().equals("1")) { hitRegInfo.setSchoolName(teacherInfo.getSchoolName()); } @@ -97,17 +103,17 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService for (HitRegInfoUser regInfoUser : hitRegInfoUsers) { switch (regInfoUser.getType()) { case "3": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.setLdTeacher(hitRegistrationTeachInfo); break; } case "2": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.getZdTeacher().add(hitRegistrationTeachInfo); break; } case "1": - HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId()); + HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.getStudentUserss().add(studentInfo); break; } @@ -125,9 +131,13 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService @Override public List selectHitRegInfoListExport(HitRegInfo hitRegInfo) { + if (ObjectUtil.isEmpty(hitRegInfo.getYear())) { + //获取当前年 + hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy")); + } Long userId = SecurityUtils.getLoginUser().getUserId(); //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队 - HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId); + HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId,hitRegInfo.getYear()); if (teacherInfo != null && teacherInfo.getType().equals("1")) { hitRegInfo.setSchoolName(teacherInfo.getSchoolName()); } @@ -139,17 +149,17 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService for (HitRegInfoUser regInfoUser : hitRegInfoUsers) { switch (regInfoUser.getType()) { case "3": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.setLdTeacher(hitRegistrationTeachInfo); break; } case "2": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.getZdTeacher().add(hitRegistrationTeachInfo); break; } case "1": - HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId()); + HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear()); regInfo.getStudentUserss().add(studentInfo); break; } @@ -372,7 +382,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserId2(userId,String.valueOf(year)); - if (ObjectUtils.isNotEmpty(hitRegInfo)){ + if (ObjectUtils.isNotEmpty(hitRegInfo)) { HitRegInfoUser hitRegInfoUser = new HitRegInfoUser(); hitRegInfoUser.setRegId(hitRegInfo.getId()); List hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser); @@ -383,6 +393,10 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService @Override public List selectStudentHitRegInfoList(HitRegInfo hitRegInfo) { + if (ObjectUtil.isEmpty(hitRegInfo.getYear())) { + //获取当前年 + hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy")); + } Long userId = SecurityUtils.getLoginUser().getUserId(); //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队 //查询当前学生所在的战队信息 @@ -415,17 +429,17 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService for (HitRegInfoUser regInfoUser : hitRegInfoUsers) { switch (regInfoUser.getType()) { case "3": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), regInfo.getYear()); regInfo.setLdTeacher(hitRegistrationTeachInfo); break; } case "2": { - HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId()); + HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), regInfo.getYear()); regInfo.getZdTeacher().add(hitRegistrationTeachInfo); break; } case "1": - HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId()); + HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(), regInfo.getYear()); regInfo.getStudentUserss().add(studentInfo); break; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java index 5136102..8577d7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java @@ -63,16 +63,18 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac /** * 根据用户id获取教师信息 + * * @param id * @return */ @Override public HitRegistrationTeachInfo selectHitRegistrationTeachInfoByUseryId(Long id) { - LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(HitRegistrationTeachInfo::getUserId,id); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HitRegistrationTeachInfo::getUserId, id); HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectOne(queryWrapper); return hitRegistrationTeachInfo; } + /** * 查询教师信息列表 * @@ -82,14 +84,16 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac @Override public List selectHitRegistrationTeachInfoList(HitRegistrationTeachInfo hitRegistrationTeachInfo) { - //获取当前年份 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy"); - String currentYear = LocalDate.now().format(formatter); - hitRegistrationTeachInfo.setYear(currentYear); + if (ObjectUtils.isEmpty(hitRegistrationTeachInfo.getYear())) { + //获取当前年份 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy"); + String currentYear = LocalDate.now().format(formatter); + hitRegistrationTeachInfo.setYear(currentYear); + } //当前教师的学校 LoginUser loginUser = SecurityUtils.getLoginUser(); - HitRegistrationTeachInfo hitRegistrationTeachInfo1 = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId()); - if(ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)){ + HitRegistrationTeachInfo hitRegistrationTeachInfo1 = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId(), hitRegistrationTeachInfo.getYear()); + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)) { hitRegistrationTeachInfo.setSchoolName(hitRegistrationTeachInfo1.getSchoolName()); } PageUtils.startPage(); @@ -116,14 +120,14 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac */ @Override public int updateHitRegistrationTeachInfo(HitRegistrationTeachInfo hitRegistrationTeachInfo) throws Exception { - if (hitRegistrationTeachInfo.getType().equals("1")&&hitRegistrationTeachInfo.getStatus().equals("1")){ + if (hitRegistrationTeachInfo.getType().equals("1") && hitRegistrationTeachInfo.getStatus().equals("1")) { //查询系统中是否存在已审核通过的同学校领队老师 - LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(HitRegistrationTeachInfo::getType,"1") - .eq(HitRegistrationTeachInfo::getSchoolName,hitRegistrationTeachInfo.getSchoolName()) - .eq(HitRegistrationTeachInfo::getStatus,"1").last("limit 1"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HitRegistrationTeachInfo::getType, "1") + .eq(HitRegistrationTeachInfo::getSchoolName, hitRegistrationTeachInfo.getSchoolName()) + .eq(HitRegistrationTeachInfo::getStatus, "1").last("limit 1"); HitRegistrationTeachInfo hitRegistrationTeachInfo1 = hitRegistrationTeachInfoMapper.selectOne(queryWrapper); - if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)){ + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo1)) { throw new Exception("已存在领队老师"); } @@ -156,6 +160,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac /** * 根据学校名称和赛区查询教师信息 + * * @param schoolName * @param division * @return @@ -182,7 +187,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac validateCaptcha(username, user.getCode(), user.getUuid()); } boolean validPhoneNumber = isValidPhoneNumber(username); - if (StringUtils.isEmpty(username)) { + if (StringUtils.isEmpty(username)) { msg = "用户名不能为空"; } else if (StringUtils.isEmpty(password)) { msg = "用户密码不能为空"; @@ -198,19 +203,19 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac sysUser.setNickName(user.getNickName()); sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser.setUserType(user.getUserType()); - boolean regFlag ; - if (user.getUserType().equals("03")){ + boolean regFlag; + if (user.getUserType().equals("03")) { //领队老师 sysUser.setRoleIds(new Long[]{102L}); - regFlag = userService.insertUser(sysUser)>0; + regFlag = userService.insertUser(sysUser) > 0; } else if (user.getUserType().equals("02")) { //指导老师 sysUser.setRoleIds(new Long[]{103L}); - regFlag = userService.insertUser(sysUser)>0; + regFlag = userService.insertUser(sysUser) > 0; } else { //指导老师 sysUser.setRoleIds(new Long[]{2L}); - regFlag= userService.registerUser(sysUser); + regFlag = userService.insertUser(sysUser) > 0; } if (!regFlag) { msg = "注册失败,请联系系统管理人员"; @@ -219,10 +224,10 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac } } - if(StringUtils.isNotEmpty(msg)){ + if (StringUtils.isNotEmpty(msg)) { throw new Exception(msg); } - if (user.getUserType().equals("02")){ + if (user.getUserType().equals("02")) { HitRegistrationTeachInfo teachInfo = user.getHitRegistrationTeachInfo(); teachInfo.setRelatedAccounts(user.getUsername()); teachInfo.setStatus("1"); @@ -230,7 +235,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac teachInfo.setTeacherName(user.getNickName()); teachInfo.setUserId(sysUser.getUserId()); this.insertHitRegistrationTeachInfo(teachInfo); - }else if (user.getUserType().equals("03")){ + } else if (user.getUserType().equals("03")) { HitRegistrationTeachInfo teachInfo = user.getHitRegistrationTeachInfo(); teachInfo.setRelatedAccounts(user.getUsername()); teachInfo.setStatus("0"); @@ -248,8 +253,8 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac * @return */ @Override - public List getSchoolName(String schoolename,String year) { - return hitRegistrationTeachInfoMapper.selectSchoolName(schoolename,year); + public List getSchoolName(String schoolename, String year) { + return hitRegistrationTeachInfoMapper.selectSchoolName(schoolename, year); } /** diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml index 05ba06a..e970b00 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml @@ -40,6 +40,7 @@ and stu_name like concat('%', #{stuName}, '%') and school_name = #{schoolName} and college_name like concat('%', #{collegeName}, '%') + and school_name like concat('%', #{schoolName}, '%') and major = #{major} and division = #{division} and phone_number = #{phoneNumber} @@ -58,9 +59,9 @@ where id = #{id} @@ -115,6 +116,7 @@ update hit_competition_student_info hit_reg_id = #{hitRegId}, + student_id = #{studentId}, stu_name = #{stuName}, school_name = #{schoolName}, college_name = #{collegeName}, diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml index e041a2e..25a3638 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml @@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sample_address = #{sampleAddress} and upload_file = #{uploadFile} and create_time LIKE concat('%', date_format(#{createTime}, '%Y'), '%') + and create_time LIKE concat(#{year}, '%') order by audit_status asc,create_time desc diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml index cac1269..04b0953 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, - category_id, - content_type, - image_url, - video_url, - content_title, - content_img, - content_detail, - source, - source_url, - original, - author, - sort_num, - editor, - summary, - tag_name, - status, - publish_date, - offline_date, - is_accessory, - accessory_url, - remark, - del_flag, - create_time, - create_by, - update_time, - update_by, - link_type, - link, - count - from cms_content - - and category_id = #{categoryId} - and content_type = #{contentType} - and content_title like concat('%', #{contentTitle}, - '%') - - and content_img = #{contentImg} - and content_detail = #{contentDetail} - and source = #{source} - and source_url = #{sourceUrl} - and original = #{original} - and author = #{author} - and editor = #{editor} - and summary = #{summary} - and status = #{status} - and publish_date = #{publishDate} - and offline_date = #{offlineDate} - and is_accessory = #{isAccessory} - and accessory_url = #{accessoryUrl} - and del_flag = #{delFlag} - - order by sort_num ASC, create_time desc, update_time desc - - - - - - - - select id, - category_id, - content_type, - image_url, - video_url, - content_title, - content_img, - source, - source_url, - tag_name, - original, - author, - sort_num, - editor, - summary, - status, - publish_date, - offline_date, - is_accessory, - accessory_url, - remark, - del_flag, - create_time, - create_by, - update_time, - update_by, - link_type, - link, - count - from cms_content - - - - - - insert into cms_content - - id, - category_id, - content_type, - content_title, - content_img, - content_detail, - source, - source_url, - original, - author, - sort_num, - editor, - tag_name, - summary, - status, - publish_date, - offline_date, - is_accessory, - accessory_url, - remark, - del_flag, - create_time, - create_by, - update_time, - update_by, - link_type, - link, - image_url, - video_url, - - - #{id}, - #{categoryId}, - #{contentType}, - #{contentTitle}, - #{contentImg}, - #{contentDetail}, - #{source}, - #{sourceUrl}, - #{original}, - #{author}, - #{sortNum}, - #{editor}, - #{tagName}, - #{summary}, - #{status}, - #{publishDate}, - #{offlineDate}, - #{isAccessory}, - - #{accessoryUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - - #{remark}, - #{delFlag}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{linkType}, - #{link}, - - #{imageUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - - - #{videoUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - - - - - - update cms_content - - category_id = #{categoryId}, - content_type = #{contentType}, - content_title = #{contentTitle}, - content_img = #{contentImg}, - content_detail = #{contentDetail}, - source = #{source}, - source_url = #{sourceUrl}, - original = #{original}, - author = #{author}, - tag_name = #{tagName}, - editor = #{editor}, - sort_num = #{sortNum}, - summary = #{summary}, - status = #{status}, - publish_date = #{publishDate}, - offline_date = #{offlineDate}, - is_accessory = #{isAccessory}, - accessory_url = #{accessoryUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - remark = #{remark}, - del_flag = #{delFlag}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - link_type = #{linkType}, - link = #{link}, - image_url = #{imageUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - video_url = #{videoUrl,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - - where id = #{id} - - - - update cms_content set count = count + 1 where id = #{id} - - - - delete - from cms_content - where id = #{id} - - - - delete from cms_content where id in - - #{id} - - - - - \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index fe16427..46dad39 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -1,6 +1,9 @@ package com.ruoyi.framework.web.service; import javax.annotation.Resource; + +import com.ruoyi.common.core.domain.entity.SysRole; +import io.netty.util.internal.ObjectUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; @@ -96,6 +99,19 @@ public class SysLoginService AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); LoginUser loginUser = (LoginUser) authentication.getPrincipal(); recordLoginInfo(loginUser.getUserId()); + + //判断当前登陆人是否是学生 + SysUser sysUser = userService.selectUserById(loginUser.getUserId()); + if (sysUser != null && sysUser.getUserType().equals("01")) { + //查询当前学生是否有普通角色 + SysRole sysRole = sysUser.getRoles().stream().filter(role -> "common".equals(role.getRoleKey())) + .findFirst().orElse(null); + if (sysRole == null) { + //给学生添加普通角色 + userService.insertUserAuth(sysUser.getUserId(), new Long[]{2L}); + } + } + // 生成token return tokenService.createToken(loginUser); } diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 925455c..e5eb4c0 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -5,7 +5,7 @@ - + <%= webpackConfig.name %> diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index 4ef4d5b..aa215b2 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -247,7 +247,7 @@ -
+
@@ -256,7 +256,7 @@
-
+
{{ item.publishDate }}
@@ -269,7 +269,7 @@
-
+
@@ -550,7 +550,7 @@ export default { this.currentActive = value this.categoryId = "" - if (value === 0 || value === 1 || value === 5) { + if (value === 0 || value === 1) { this.pageContext = "" this.getContentDetail() } else { @@ -587,10 +587,10 @@ export default { }) }, handleDataFromPage(data) { - if (this.currentActive === 3 || this.currentActive == 4) { + if (this.currentActive === 3 ) { this.otherList = data } - if (this.currentActive === 2) { + if (this.currentActive === 2 || this.currentActive == 5 || this.currentActive == 4) { this.noticeList = data } }, diff --git a/ruoyi-ui/src/views/officialWebsite/platform.vue b/ruoyi-ui/src/views/officialWebsite/platform.vue index 2787c59..6a25b6e 100644 --- a/ruoyi-ui/src/views/officialWebsite/platform.vue +++ b/ruoyi-ui/src/views/officialWebsite/platform.vue @@ -25,13 +25,14 @@
-
-
-
-
-
- -
+ + + + + + + +
@@ -122,13 +123,19 @@ export default { }, // 触发导航 getCurrentActive(value) { + console.log('value',value) if (this.currentActive == value) { return } this.currentActive = value - if (value === 1){ - this.getContentDetail(); - } + // if (value === 1){ + // this.getContentDetail(); + // } + this.categoryId = this.nav[this.currentActive].id + // getCategoryByParentId(this.routeParam.categoryId).then(res => { + // this.nav = res.data + // this.categoryId = res.data[0].id + // }) }, getContentDetail() { this.routeParam.categoryId = this.nav[this.currentActive].id diff --git a/ruoyi-ui/src/views/officialWebsite/teaching.vue b/ruoyi-ui/src/views/officialWebsite/teaching.vue index 7eecc6e..69fa63e 100644 --- a/ruoyi-ui/src/views/officialWebsite/teaching.vue +++ b/ruoyi-ui/src/views/officialWebsite/teaching.vue @@ -164,7 +164,11 @@ export default { initPageData() { getCategoryByParentId(this.routeParam.categoryId).then(res => { this.nav = res.data - this.categoryId = this.nav[0].id + if (this.nav.length > 0) { + this.categoryId = this.nav[0].id + }else { + this.categoryId = this.$route.query.id + } }) }, }