From d9355f2556bb2e232392021e01715fcaa55eba73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=84=89=E5=BF=AB=E7=9A=84=E5=A4=A7=E7=A6=8F?= <8790092+honest_zcy@user.noreply.gitee.com> Date: Tue, 20 Aug 2024 18:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/api/CMSCategoryAPI.java | 9 +- .../api/HitRegistrationStudentInfoAPI.java | 17 +- .../cms/controller/HitRegInfoController.java | 104 ++++ .../HitRegistrationStudentInfoController.java | 80 +-- .../HitRegistrationTeachInfoController.java | 16 +- .../java/com/ruoyi/cms/domain/HitRegInfo.java | 70 +++ .../domain/HitRegistrationStudentInfo.java | 149 ++++-- .../cms/domain/HitRegistrationTeachInfo.java | 121 ++++- .../vo/HitRegistrationStudentInfoVo.java | 2 + .../ruoyi/cms/mapper/CmsContentMapper.java | 2 + .../ruoyi/cms/mapper/HitRegInfoMapper.java | 64 +++ .../HitRegistrationStudentInfoMapper.java | 14 +- .../HitRegistrationTeachInfoMapper.java | 11 +- .../cms/service/ICmsCategoryService.java | 3 + .../ruoyi/cms/service/IHitRegInfoService.java | 61 +++ .../IHitRegistrationStudentInfoService.java | 15 +- .../IHitRegistrationTeachInfoService.java | 13 +- .../service/impl/CmsCategoryServiceImpl.java | 15 +- .../service/impl/HitRegInfoServiceImpl.java | 134 +++++ ...HitRegistrationStudentInfoServiceImpl.java | 43 +- .../HitRegistrationTeachInfoServiceImpl.java | 34 +- .../src/main/resources/application.yml | 2 +- .../main/resources/config/ueditor/config.json | 10 +- .../resources/mapper/cms/CmsContentMapper.xml | 85 +++- .../resources/mapper/cms/HitRegInfoMapper.xml | 118 +++++ .../cms/HitRegistrationStudentInfoMapper.xml | 155 +----- .../cms/HitRegistrationTeachInfoMapper.xml | 17 +- .../framework/config/SecurityConfig.java | 3 +- ruoyi-ui/public/static/附件2_报名表.docx | Bin 0 -> 18326 bytes .../src/api/hit/registrationStudentInfo.js | 4 +- .../api/officialWebsite/registerStudent.js | 2 +- .../hit/registrationStudentInfo/index.vue | 264 +++++----- .../src/views/officialWebsite/competition.vue | 470 +++++++++--------- 33 files changed, 1342 insertions(+), 765 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml create mode 100644 ruoyi-ui/public/static/附件2_报名表.docx diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java index f740360..1fdfa79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java @@ -40,7 +40,14 @@ public class CMSCategoryAPI extends BaseController { if (contentQuery.getCategoryId() == null) return success(); return success(categoryService.getContentById(contentQuery)); } - + /** + * 获取某个子栏目的内容 + */ + @PostMapping("/contentList") + public AjaxResult contentList(@RequestBody CmsContentQuery contentQuery){ + if (contentQuery.getCategoryId() == null) return success(); + return success(categoryService.contentList(contentQuery)); + } /** * 获取某个子栏目的内容 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitRegistrationStudentInfoAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitRegistrationStudentInfoAPI.java index 8ccec18..9b7d519 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitRegistrationStudentInfoAPI.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitRegistrationStudentInfoAPI.java @@ -49,20 +49,5 @@ public class HitRegistrationStudentInfoAPI extends BaseController return toAjax(hitRegistrationStudentInfoService.insertHitRegistrationStudentInfo(studentInfo)); } - /** - * 老师信息验证或插入 - * @param teachInfo - * @return - */ - @PostMapping("/addTeach") - public AjaxResult addTeach(@RequestBody HitRegistrationTeachInfo teachInfo){ - Long id = hitRegistrationTeachInfoService.checkExist(teachInfo); - if (id != null){ - return success(id); - }else { - int flag = hitRegistrationTeachInfoService.insertHitRegistrationTeachInfo(teachInfo); - if (flag > 0) return success(teachInfo.getId()); - else return error(); - } - } + } 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 new file mode 100644 index 0000000..bc39e4f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java @@ -0,0 +1,104 @@ +package com.ruoyi.cms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.cms.domain.HitRegInfo; +import com.ruoyi.cms.service.IHitRegInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 报名信息Controller + * + * @author zcy + * @date 2024-08-20 + */ +@RestController +@RequestMapping("/system/hit_reg_info") +public class HitRegInfoController extends BaseController +{ + @Autowired + private IHitRegInfoService hitRegInfoService; + + /** + * 查询报名信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:list')") + @GetMapping("/list") + public TableDataInfo list(HitRegInfo hitRegInfo) + { + startPage(); + List list = hitRegInfoService.selectHitRegInfoList(hitRegInfo); + return getDataTable(list); + } + + /** + * 导出报名信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:export')") + @Log(title = "报名信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, HitRegInfo hitRegInfo) + { + List list = hitRegInfoService.selectHitRegInfoList(hitRegInfo); + ExcelUtil util = new ExcelUtil(HitRegInfo.class); + util.exportExcel(response, list, "报名信息数据"); + } + + /** + * 获取报名信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(hitRegInfoService.selectHitRegInfoById(id)); + } + + /** + * 新增报名信息 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:add')") + @Log(title = "报名信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody HitRegInfo hitRegInfo) + { + return toAjax(hitRegInfoService.insertHitRegInfo(hitRegInfo)); + } + + /** + * 修改报名信息 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:edit')") + @Log(title = "报名信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody HitRegInfo hitRegInfo) + { + return toAjax(hitRegInfoService.updateHitRegInfo(hitRegInfo)); + } + + /** + * 删除报名信息 + */ + @PreAuthorize("@ss.hasPermi('system:hit_reg_info:remove')") + @Log(title = "报名信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(hitRegInfoService.deleteHitRegInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationStudentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationStudentInfoController.java index 83fa852..c12592e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationStudentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationStudentInfoController.java @@ -1,15 +1,7 @@ package com.ruoyi.cms.controller; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; - -import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.cms.domain.vo.HitRegistrationStudentInfoVo; -import com.ruoyi.cms.export.HitRegistrationStudentInfoExport; -import com.ruoyi.cms.service.IHitRegistrationTeachInfoService; -import org.apache.ibatis.annotations.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,56 +25,44 @@ import com.ruoyi.common.core.page.TableDataInfo; * 报名信息Controller * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ @RestController -@RequestMapping("/hit/hitRegistrationStudentInfo") +@RequestMapping("/HitRegistrationStudentInfo/HitRegistrationStudentInfo") public class HitRegistrationStudentInfoController extends BaseController { @Autowired private IHitRegistrationStudentInfoService hitRegistrationStudentInfoService; - @Autowired - private IHitRegistrationTeachInfoService hitRegistrationTeachInfoService; - /** * 查询报名信息列表 */ -// @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:list')") -// @GetMapping("/list") -// public TableDataInfo list(HitRegistrationStudentInfo hitRegistrationStudentInfo) -// { -// startPage(); -// List list = hitRegistrationStudentInfoService.selectHitRegistrationStudentInfoList(hitRegistrationStudentInfo); -// return getDataTable(list); -// } + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:list')") + @GetMapping("/list") + public TableDataInfo list(HitRegistrationStudentInfo hitRegistrationStudentInfo) + { + startPage(); + List list = hitRegistrationStudentInfoService.selectHitRegistrationStudentInfoList(hitRegistrationStudentInfo); + return getDataTable(list); + } /** * 导出报名信息列表 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:export')") + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:export')") @Log(title = "报名信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, HitRegistrationStudentInfoVo studentInfoVo) + public void export(HttpServletResponse response, HitRegistrationStudentInfo hitRegistrationStudentInfo) { - List list = hitRegistrationStudentInfoService.selectStudentInfoNew(studentInfoVo); - - /** 转换为excel要的字段 */ - List result = list.stream().map(item -> { - HitRegistrationStudentInfoExport export = new HitRegistrationStudentInfoExport(); - BeanUtil.copyProperties(item, export); - export.setLeaderNames(String.join(",", item.getLeaderNames())); - export.setGuideNames(String.join(",", item.getGuideNames())); - return export; - }).collect(Collectors.toList()); - ExcelUtil util = new ExcelUtil(HitRegistrationStudentInfoExport.class); - util.exportExcel(response, result, "报名信息数据"); + List list = hitRegistrationStudentInfoService.selectHitRegistrationStudentInfoList(hitRegistrationStudentInfo); + ExcelUtil util = new ExcelUtil(HitRegistrationStudentInfo.class); + util.exportExcel(response, list, "报名信息数据"); } /** * 获取报名信息详细信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:query')") + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -92,7 +72,7 @@ public class HitRegistrationStudentInfoController extends BaseController /** * 新增报名信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:add')") + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:add')") @Log(title = "报名信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HitRegistrationStudentInfo hitRegistrationStudentInfo) @@ -103,7 +83,7 @@ public class HitRegistrationStudentInfoController extends BaseController /** * 修改报名信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:edit')") + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:edit')") @Log(title = "报名信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HitRegistrationStudentInfo hitRegistrationStudentInfo) @@ -114,33 +94,11 @@ public class HitRegistrationStudentInfoController extends BaseController /** * 删除报名信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:remove')") + @PreAuthorize("@ss.hasPermi('HitRegistrationStudentInfo:HitRegistrationStudentInfo:remove')") @Log(title = "报名信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(hitRegistrationStudentInfoService.deleteHitRegistrationStudentInfoByIds(ids)); } - - /** - * 自定义查询 - * @param studentInfoVo - * @return - */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationStudentInfo:list')") - @GetMapping("/list") - public TableDataInfo list(HitRegistrationStudentInfoVo studentInfoVo) - { - startPage(); - List list = hitRegistrationStudentInfoService.selectStudentInfoNew(studentInfoVo); - return getDataTable(list); - } - - /** - * 查询老师信息 - */ - @GetMapping("/getTeach/{ids}") - public AjaxResult getTeachInfo(@PathVariable Long[] ids){ - return success(hitRegistrationTeachInfoService.listByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java index 20e5f51..8d13962 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegistrationTeachInfoController.java @@ -25,10 +25,10 @@ import com.ruoyi.common.core.page.TableDataInfo; * 教师信息Controller * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ @RestController -@RequestMapping("/hit/hitRegistrationTeachInfo") +@RequestMapping("/HitRegistrationTeachInfo/HitRegistrationTeachInfo") public class HitRegistrationTeachInfoController extends BaseController { @Autowired @@ -37,7 +37,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 查询教师信息列表 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:list')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:list')") @GetMapping("/list") public TableDataInfo list(HitRegistrationTeachInfo hitRegistrationTeachInfo) { @@ -49,7 +49,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 导出教师信息列表 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:export')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:export')") @Log(title = "教师信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HitRegistrationTeachInfo hitRegistrationTeachInfo) @@ -62,7 +62,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 获取教师信息详细信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:query')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 新增教师信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:add')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:add')") @Log(title = "教师信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HitRegistrationTeachInfo hitRegistrationTeachInfo) @@ -83,7 +83,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 修改教师信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:edit')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:edit')") @Log(title = "教师信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HitRegistrationTeachInfo hitRegistrationTeachInfo) @@ -94,7 +94,7 @@ public class HitRegistrationTeachInfoController extends BaseController /** * 删除教师信息 */ - @PreAuthorize("@ss.hasPermi('hit:hitRegistrationTeachInfo:remove')") + @PreAuthorize("@ss.hasPermi('HitRegistrationTeachInfo:HitRegistrationTeachInfo:remove')") @Log(title = "教师信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) 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 new file mode 100644 index 0000000..ca70f12 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java @@ -0,0 +1,70 @@ +package com.ruoyi.cms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +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; + +/** + * 报名信息对象 hit_reg_info + * + * @author zcy + * @date 2024-08-20 + */ +@Data +public class HitRegInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + + @TableId(type = IdType.AUTO) + private Long id; + + /** 学校 */ + @Excel(name = "学校") + private String schoolName; + + /** 学院 */ + @Excel(name = "学院") + private String collegeName; + + /** 所属赛区 */ + @Excel(name = "所属赛区") + private String division; + + /** 团队名称（个人赛不需求，可以为空） */ + @Excel(name = "团队名称", readConverterExp = "个=人赛不需求，可以为空") + private String teamName; + + /** 盲样联系人 */ + @Excel(name = "盲样联系人") + private String sampleConcat; + + /** 盲样联第人电话 */ + @Excel(name = "盲样联第人电话") + private String sampleNumber; + + /** 盲样邮寄地址 */ + @Excel(name = "盲样邮寄地址") + private String sampleAddress; + + /** 附件 */ + @Excel(name = "附件") + private String uploadFile; + //0未审核1审核通过2审核拒绝 + private String auditStatus; + + /** 逻辑删除0未删除1真删除 */ + private Long delFlag; + @TableField(exist = false) + private List studentInfoList; + @TableField(exist = false) + private List teacherInfoList; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationStudentInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationStudentInfo.java index f165e75..e9d37e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationStudentInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationStudentInfo.java @@ -1,78 +1,127 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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 lombok.Data; - -import java.util.List; /** * 报名信息对象 hit_registration_student_info * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -@Data public class HitRegistrationStudentInfo extends BaseEntity { private static final long serialVersionUID = 1L; - /** 报名信息ID */ + /** 主键 */ + @TableId(type = IdType.AUTO) private Long id; - /** 大赛ID */ - @Excel(name = "大赛ID") - private Long competitionId; + /** 报名主键 */ + @Excel(name = "报名主键") + private Long hitRegId; - /** 学生姓名 */ - @Excel(name = "学生姓名") + /** 姓名 */ + @Excel(name = "姓名") private String stuName; - /** 学生性别（0：男，1：女） */ - @Excel(name = "学生性别", readConverterExp = "0=：男，1：女") - private String stuGender; + /** 性别 */ + @Excel(name = "性别") + private String sex; - /** 学生专业 */ - @Excel(name = "学生专业") - private String stuMajor; + /** 专业 */ + @Excel(name = "专业") + private String major; - /** 学生手机号 */ - @Excel(name = "学生手机号") - private String stuNumber; - - /** 学校及院系名称 */ - @Excel(name = "学校及院系名称") - private String schoolName; - - /** 所属赛区 */ - @Excel(name = "所属赛区") - private String division; - - /** 团队名称（个人赛不需求，可以为空） */ - @Excel(name = "团队名称", readConverterExp = "个=人赛不需求，可以为空") - private String teamName; - - /** 领队教师ID集合 */ - @Excel(name = "领队教师ID集合") - private List leaderIds; - - /** 指导老师ID集合 */ - @Excel(name = "指导老师ID集合") - private List guideIds; + /** 电话号码 */ + @Excel(name = "电话号码") + private String phoneNumber; /** 逻辑删除0未删除1真删除 */ - private Integer delFlag; + private Long delFlag; - /** 盲样收件人 */ - @Excel(name = "盲样收件人") - private String sampleConcat; + public void setId(Long id) + { + this.id = id; + } - /** 盲样收件人电话 */ - @Excel(name = "盲样收件人电话") - private String sampleNumber; + public Long getId() + { + return id; + } + public void setHitRegId(Long hitRegId) + { + this.hitRegId = hitRegId; + } - /** 盲样邮寄地址 */ - @Excel(name = "盲样邮寄地址") - private String sampleAddress; + public Long getHitRegId() + { + return hitRegId; + } + public void setStuName(String stuName) + { + this.stuName = stuName; + } + public String getStuName() + { + return stuName; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setMajor(String major) + { + this.major = major; + } + + public String getMajor() + { + return major; + } + public void setPhoneNumber(String phoneNumber) + { + this.phoneNumber = phoneNumber; + } + + public String getPhoneNumber() + { + return phoneNumber; + } + public void setDelFlag(Long delFlag) + { + this.delFlag = delFlag; + } + + public Long getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("hitRegId", getHitRegId()) + .append("stuName", getStuName()) + .append("sex", getSex()) + .append("major", getMajor()) + .append("phoneNumber", getPhoneNumber()) + .append("delFlag", getDelFlag()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .toString(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationTeachInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationTeachInfo.java index 75e0ea4..311541e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationTeachInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationTeachInfo.java @@ -1,23 +1,30 @@ package com.ruoyi.cms.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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 lombok.Data; /** * 教师信息对象 hit_registration_teach_info * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -@Data public class HitRegistrationTeachInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** 教师ID */ + @TableId(type = IdType.AUTO) private Long id; + /** 报名主键 */ + @Excel(name = "报名主键") + private Long hitRegId; + /** 教师姓名 */ @Excel(name = "教师姓名") private String teacherName; @@ -39,5 +46,111 @@ public class HitRegistrationTeachInfo extends BaseEntity private String teacherSchool; /** 逻辑删除0未删除1真删除 */ - private Integer delFlag; + private Long delFlag; + + /** 0指导老师1领队老师 */ + @Excel(name = "0指导老师1领队老师") + private String type; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setHitRegId(Long hitRegId) + { + this.hitRegId = hitRegId; + } + + public Long getHitRegId() + { + return hitRegId; + } + public void setTeacherName(String teacherName) + { + this.teacherName = teacherName; + } + + public String getTeacherName() + { + return teacherName; + } + public void setTeacherJob(String teacherJob) + { + this.teacherJob = teacherJob; + } + + public String getTeacherJob() + { + return teacherJob; + } + public void setTeacherNumber(String teacherNumber) + { + this.teacherNumber = teacherNumber; + } + + public String getTeacherNumber() + { + return teacherNumber; + } + public void setTeacherEmail(String teacherEmail) + { + this.teacherEmail = teacherEmail; + } + + public String getTeacherEmail() + { + return teacherEmail; + } + public void setTeacherSchool(String teacherSchool) + { + this.teacherSchool = teacherSchool; + } + + public String getTeacherSchool() + { + return teacherSchool; + } + public void setDelFlag(Long delFlag) + { + this.delFlag = delFlag; + } + + public Long getDelFlag() + { + return delFlag; + } + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("hitRegId", getHitRegId()) + .append("teacherName", getTeacherName()) + .append("teacherJob", getTeacherJob()) + .append("teacherNumber", getTeacherNumber()) + .append("teacherEmail", getTeacherEmail()) + .append("teacherSchool", getTeacherSchool()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("type", getType()) + .toString(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java index d1f0321..dabcb5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java @@ -34,6 +34,7 @@ public class HitRegistrationStudentInfoVo extends BaseEntity { /** 学校及院系名称 */ @Excel(name = "学校及院系名称") private String schoolName; + private String collegeName; /** 所属赛区 */ @Excel(name = "所属赛区") @@ -85,4 +86,5 @@ public class HitRegistrationStudentInfoVo extends BaseEntity { /** 时间 */ private Date createTime; + private String uploadFile; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java index 817824c..5201732 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java @@ -29,6 +29,8 @@ public interface CmsContentMapper extends BaseMapper * @return 内容集合 */ public List selectCmsContentList(CmsContent cmsContent); + public List contentList(CmsContent cmsContent); + /** * 查询内容列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegInfoMapper.java new file mode 100644 index 0000000..7cc4c6f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegInfoMapper.java @@ -0,0 +1,64 @@ +package com.ruoyi.cms.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cms.domain.HitRegInfo; +import com.ruoyi.cms.domain.HitRegistrationTeachInfo; + +/** + * 报名信息Mapper接口 + * + * @author zcy + * @date 2024-08-20 + */ +public interface HitRegInfoMapper extends BaseMapper +{ + /** + * 查询报名信息 + * + * @param id 报名信息主键 + * @return 报名信息 + */ + public HitRegInfo selectHitRegInfoById(Long id); + + /** + * 查询报名信息列表 + * + * @param hitRegInfo 报名信息 + * @return 报名信息集合 + */ + public List selectHitRegInfoList(HitRegInfo hitRegInfo); + + /** + * 新增报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + public int insertHitRegInfo(HitRegInfo hitRegInfo); + + /** + * 修改报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + public int updateHitRegInfo(HitRegInfo hitRegInfo); + + /** + * 删除报名信息 + * + * @param id 报名信息主键 + * @return 结果 + */ + public int deleteHitRegInfoById(Long id); + + /** + * 批量删除报名信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteHitRegInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationStudentInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationStudentInfoMapper.java index b176c98..32bfc98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationStudentInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationStudentInfoMapper.java @@ -4,16 +4,15 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.cms.domain.HitRegistrationStudentInfo; -import com.ruoyi.cms.domain.HitRegistrationTeachInfo; -import com.ruoyi.cms.domain.vo.HitRegistrationStudentInfoVo; +import com.ruoyi.cms.domain.Imitation; /** * 报名信息Mapper接口 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -public interface HitRegistrationStudentInfoMapper extends BaseMapper +public interface HitRegistrationStudentInfoMapper extends BaseMapper { /** * 查询报名信息 @@ -62,11 +61,4 @@ public interface HitRegistrationStudentInfoMapper extends BaseMapper selectStudentInfoNew(HitRegistrationStudentInfoVo studentInfoVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java index 7d004d5..e022b8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java @@ -10,9 +10,9 @@ import com.ruoyi.cms.domain.HitRegistrationTeachInfo; * 教师信息Mapper接口 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -public interface HitRegistrationTeachInfoMapper extends BaseMapper +public interface HitRegistrationTeachInfoMapper extends BaseMapper { /** * 查询教师信息 @@ -61,11 +61,4 @@ public interface HitRegistrationTeachInfoMapper extends BaseMapper */ public PageInfo getContentById(CmsContentQuery contentQuery); + public PageInfo contentList(CmsContentQuery contentQuery); + + /** * 按ID查文章 * @return 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 new file mode 100644 index 0000000..f42b7ae --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.cms.service; + +import java.util.List; +import com.ruoyi.cms.domain.HitRegInfo; + +/** + * 报名信息Service接口 + * + * @author zcy + * @date 2024-08-20 + */ +public interface IHitRegInfoService +{ + /** + * 查询报名信息 + * + * @param id 报名信息主键 + * @return 报名信息 + */ + public HitRegInfo selectHitRegInfoById(Long id); + + /** + * 查询报名信息列表 + * + * @param hitRegInfo 报名信息 + * @return 报名信息集合 + */ + public List selectHitRegInfoList(HitRegInfo hitRegInfo); + + /** + * 新增报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + public int insertHitRegInfo(HitRegInfo hitRegInfo); + + /** + * 修改报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + public int updateHitRegInfo(HitRegInfo hitRegInfo); + + /** + * 批量删除报名信息 + * + * @param ids 需要删除的报名信息主键集合 + * @return 结果 + */ + public int deleteHitRegInfoByIds(Long[] ids); + + /** + * 删除报名信息信息 + * + * @param id 报名信息主键 + * @return 结果 + */ + public int deleteHitRegInfoById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationStudentInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationStudentInfoService.java index 22dfd30..403b336 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationStudentInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationStudentInfoService.java @@ -1,19 +1,15 @@ package com.ruoyi.cms.service; import java.util.List; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.ruoyi.cms.domain.HitRegistrationStudentInfo; -import com.ruoyi.cms.domain.vo.HitRegistrationStudentInfoVo; /** * 报名信息Service接口 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -public interface IHitRegistrationStudentInfoService extends IService +public interface IHitRegistrationStudentInfoService { /** * 查询报名信息 @@ -62,11 +58,4 @@ public interface IHitRegistrationStudentInfoService extends IService selectStudentInfoNew(HitRegistrationStudentInfoVo studentInfoVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationTeachInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationTeachInfoService.java index 25e7501..a358760 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationTeachInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegistrationTeachInfoService.java @@ -1,17 +1,15 @@ package com.ruoyi.cms.service; import java.util.List; - -import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cms.domain.HitRegistrationTeachInfo; /** * 教师信息Service接口 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ -public interface IHitRegistrationTeachInfoService extends IService +public interface IHitRegistrationTeachInfoService { /** * 查询教师信息 @@ -60,11 +58,4 @@ public interface IHitRegistrationTeachInfoService extends IService contents = contentMapper.selectCmsContentList(content); + + return new PageInfo(contents); + } + + @Override + public PageInfo contentList(CmsContentQuery contentQuery) { + PageHelper.startPage(contentQuery.getPageNum(), contentQuery.getPageSize()); + CmsContent content = new CmsContent(); + content.setCategoryId(contentQuery.getCategoryId()); + content.setStatus("1"); + content.setDelFlag(0); + List contents = contentMapper.contentList(content); + return new PageInfo(contents); } @@ -286,6 +299,6 @@ public class CmsCategoryServiceImpl extends ServiceImpl getCategoryIdByParentId(Long id){ - return baseMapper.selectList(new QueryWrapper().eq("parent_id", id)); + return baseMapper.selectList(new QueryWrapper().eq("parent_id", id).orderByAsc("category_sort")); } } 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 new file mode 100644 index 0000000..84cf332 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java @@ -0,0 +1,134 @@ +package com.ruoyi.cms.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.cms.domain.HitRegistrationStudentInfo; +import com.ruoyi.cms.domain.HitRegistrationTeachInfo; +import com.ruoyi.cms.mapper.HitRegistrationStudentInfoMapper; +import com.ruoyi.cms.mapper.HitRegistrationTeachInfoMapper; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.cms.mapper.HitRegInfoMapper; +import com.ruoyi.cms.domain.HitRegInfo; +import com.ruoyi.cms.service.IHitRegInfoService; +import org.springframework.transaction.annotation.Transactional; + +/** + * 报名信息Service业务层处理 + * + * @author zcy + * @date 2024-08-20 + */ +@Service +public class HitRegInfoServiceImpl implements IHitRegInfoService +{ + @Autowired + private HitRegInfoMapper hitRegInfoMapper; + @Autowired + private HitRegistrationStudentInfoMapper studentInfoMapper; + @Autowired + private HitRegistrationTeachInfoMapper teachInfoMapper; + + /** + * 查询报名信息 + * + * @param id 报名信息主键 + * @return 报名信息 + */ + @Override + public HitRegInfo selectHitRegInfoById(Long id) + { + return hitRegInfoMapper.selectHitRegInfoById(id); + } + + /** + * 查询报名信息列表 + * + * @param hitRegInfo 报名信息 + * @return 报名信息 + */ + @Override + public List selectHitRegInfoList(HitRegInfo hitRegInfo) + { + List hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo); + for (HitRegInfo regInfo : hitRegInfos) { + LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); + queryWrapper.eq(HitRegistrationStudentInfo::getHitRegId,regInfo.getId()); + List hitRegistrationStudentInfos = studentInfoMapper.selectList(queryWrapper); + + LambdaQueryWrapper queryWrapper2 =new LambdaQueryWrapper<>(); + queryWrapper2.eq(HitRegistrationTeachInfo::getHitRegId,regInfo.getId()).orderByDesc(HitRegistrationTeachInfo::getType); + List teachInfos = teachInfoMapper.selectList(queryWrapper2); + regInfo.setStudentInfoList(hitRegistrationStudentInfos); + regInfo.setTeacherInfoList(teachInfos); + } + return hitRegInfos; + } + + /** + * 新增报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertHitRegInfo(HitRegInfo hitRegInfo) + { + hitRegInfo.setCreateTime(DateUtils.getNowDate()); + hitRegInfoMapper.insertHitRegInfo(hitRegInfo); + for (HitRegistrationStudentInfo hitRegistrationStudentInfo : hitRegInfo.getStudentInfoList()) { + hitRegistrationStudentInfo.setHitRegId(hitRegInfo.getId()); + studentInfoMapper.insert(hitRegistrationStudentInfo); + + } + for (HitRegistrationTeachInfo hitRegistrationTeachInfo : hitRegInfo.getTeacherInfoList()) { + if (StringUtils.isNotEmpty(hitRegistrationTeachInfo.getTeacherName())){ + hitRegistrationTeachInfo.setHitRegId(hitRegInfo.getId()); + teachInfoMapper.insert(hitRegistrationTeachInfo); + } + + } + return 1; + } + + /** + * 修改报名信息 + * + * @param hitRegInfo 报名信息 + * @return 结果 + */ + @Override + public int updateHitRegInfo(HitRegInfo hitRegInfo) + { + hitRegInfo.setUpdateTime(DateUtils.getNowDate()); + return hitRegInfoMapper.updateHitRegInfo(hitRegInfo); + } + + /** + * 批量删除报名信息 + * + * @param ids 需要删除的报名信息主键 + * @return 结果 + */ + @Override + public int deleteHitRegInfoByIds(Long[] ids) + { + return hitRegInfoMapper.deleteHitRegInfoByIds(ids); + } + + /** + * 删除报名信息信息 + * + * @param id 报名信息主键 + * @return 结果 + */ + @Override + public int deleteHitRegInfoById(Long id) + { + return hitRegInfoMapper.deleteHitRegInfoById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationStudentInfoServiceImpl.java index cbb5751..5b8f10e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationStudentInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationStudentInfoServiceImpl.java @@ -1,30 +1,24 @@ package com.ruoyi.cms.service.impl; -import cn.hutool.core.lang.Snowflake; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ruoyi.cms.domain.HitRegistrationStudentInfo; -import com.ruoyi.cms.domain.vo.HitRegistrationStudentInfoVo; -import com.ruoyi.cms.mapper.HitRegistrationStudentInfoMapper; -import com.ruoyi.cms.service.IHitRegistrationStudentInfoService; +import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.util.List; +import com.ruoyi.cms.mapper.HitRegistrationStudentInfoMapper; +import com.ruoyi.cms.domain.HitRegistrationStudentInfo; +import com.ruoyi.cms.service.IHitRegistrationStudentInfoService; /** * 报名信息Service业务层处理 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ @Service -public class HitRegistrationStudentInfoServiceImpl extends ServiceImpl implements IHitRegistrationStudentInfoService +public class HitRegistrationStudentInfoServiceImpl implements IHitRegistrationStudentInfoService { @Autowired - private Snowflake snowflake; + private HitRegistrationStudentInfoMapper hitRegistrationStudentInfoMapper; /** * 查询报名信息 @@ -35,7 +29,7 @@ public class HitRegistrationStudentInfoServiceImpl extends ServiceImpl selectHitRegistrationStudentInfoList(HitRegistrationStudentInfo hitRegistrationStudentInfo) { - return baseMapper.selectHitRegistrationStudentInfoList(hitRegistrationStudentInfo); + return hitRegistrationStudentInfoMapper.selectHitRegistrationStudentInfoList(hitRegistrationStudentInfo); } /** @@ -59,9 +53,8 @@ public class HitRegistrationStudentInfoServiceImpl extends ServiceImpl selectStudentInfoNew(HitRegistrationStudentInfoVo studentInfoVo){ - return baseMapper.selectStudentInfoNew(studentInfoVo); + return hitRegistrationStudentInfoMapper.deleteHitRegistrationStudentInfoById(id); } } 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 f2f1058..1f94b5b 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 @@ -1,11 +1,6 @@ package com.ruoyi.cms.service.impl; import java.util.List; - -import cn.hutool.core.lang.Snowflake; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,13 +12,13 @@ import com.ruoyi.cms.service.IHitRegistrationTeachInfoService; * 教师信息Service业务层处理 * * @author 点亮信息 - * @date 2024-07-26 + * @date 2024-08-20 */ @Service -public class HitRegistrationTeachInfoServiceImpl extends ServiceImpl implements IHitRegistrationTeachInfoService +public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeachInfoService { @Autowired - private Snowflake snowflake; + private HitRegistrationTeachInfoMapper hitRegistrationTeachInfoMapper; /** * 查询教师信息 @@ -34,7 +29,7 @@ public class HitRegistrationTeachInfoServiceImpl extends ServiceImpl selectHitRegistrationTeachInfoList(HitRegistrationTeachInfo hitRegistrationTeachInfo) { - return baseMapper.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo); + return hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoList(hitRegistrationTeachInfo); } /** @@ -58,9 +53,8 @@ public class HitRegistrationTeachInfoServiceImpl extends ServiceImpl + + + + + and school_name like concat('%', #{schoolName}, '%') + and college_name like concat('%', #{collegeName}, '%') + and division = #{division} + and team_name like concat('%', #{teamName}, '%') + and sample_concat = #{sampleConcat} + and sample_number = #{sampleNumber} + and sample_address = #{sampleAddress} + and upload_file = #{uploadFile} + + order by audit_status asc,create_time desc + + + + + + insert into hit_reg_info + + school_name, + college_name, + division, + team_name, + sample_concat, + sample_number, + sample_address, + remark, + upload_file, + del_flag, + create_time, + create_by, + update_time, + update_by, + + + #{schoolName}, + #{collegeName}, + #{division}, + #{teamName}, + #{sampleConcat}, + #{sampleNumber}, + #{sampleAddress}, + #{remark}, + #{uploadFile}, + #{delFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + + + + + update hit_reg_info + + school_name = #{schoolName}, + college_name = #{collegeName}, + division = #{division}, + team_name = #{teamName}, + sample_concat = #{sampleConcat}, + sample_number = #{sampleNumber}, + sample_address = #{sampleAddress}, + audit_status = #{auditStatus}, + remark = #{remark}, + upload_file = #{uploadFile}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from hit_reg_info where id = #{id} + + + + delete from hit_reg_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationStudentInfoMapper.xml index fc258c6..84085f8 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationStudentInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationStudentInfoMapper.xml @@ -6,44 +6,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - - - - - - - - - + + + - - - - select id, sample_concat, sample_number, sample_address, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark, del_flag, create_time, create_by, update_time, update_by from hit_registration_student_info + select id, hit_reg_id, stu_name, sex, major, phone_number, del_flag, create_time, create_by, update_time, update_by from hit_registration_student_info @@ -56,64 +42,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into hit_registration_student_info id, - competition_id, + hit_reg_id, stu_name, - stu_gender, - stu_major, - stu_number, - school_name, - division, - team_name, - leader_ids, - guide_ids, - remark, + sex, + major, + phone_number, del_flag, create_time, create_by, update_time, update_by, - sample_concat, - sample_number, - sample_address, #{id}, - #{competitionId}, + #{hitRegId}, #{stuName}, - #{stuGender}, - #{stuMajor}, - #{stuNumber}, - #{schoolName}, - #{division}, - #{teamName}, - #{leaderIds,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - #{guideIds,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - #{remark}, + #{sex}, + #{major}, + #{phoneNumber}, #{delFlag}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, - #{sampleConcat}, - #{sampleNumber}, - #{sampleAddress}, update hit_registration_student_info - competition_id = #{competitionId}, + hit_reg_id = #{hitRegId}, stu_name = #{stuName}, - stu_gender = #{stuGender}, - stu_major = #{stuMajor}, - stu_number = #{stuNumber}, - school_name = #{schoolName}, - division = #{division}, - team_name = #{teamName}, - leader_ids = #{leaderIds,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - guide_ids = #{guideIds,jdbcType=OTHER,typeHandler=com.ruoyi.system.handler.MysqlTypeHandler}, - remark = #{remark}, + sex = #{sex}, + major = #{major}, + phone_number = #{phoneNumber}, del_flag = #{delFlag}, create_time = #{createTime}, create_by = #{createBy}, @@ -133,79 +95,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - - - - select - id, sample_concat, sample_number, sample_address, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark,del_flag, create_time, create_by, update_time, update_by,competition_name, competition_type, leader_names, guide_names - from - (SELECT - s.id, s.competition_id, s.stu_name, s.stu_gender, s.stu_major, s.stu_number, s.school_name, s.division, s.team_name, s.leader_ids, s.guide_ids, s.remark, s.del_flag, s.create_time, s.create_by, s.update_time, s.update_by,c.competition_name, c.competition_type, s.sample_concat, s.sample_number, s.sample_address, - CONCAT('[', - GROUP_CONCAT(JSON_QUOTE(t.teacher_name) ORDER BY t.teacher_name SEPARATOR ','), - ']') AS leader_names - FROM - hit_registration_student_info s - LEFT JOIN - hit_registration_teach_info t ON JSON_CONTAINS(s.leader_ids, CAST(t.id AS JSON), '$') - LEFT JOIN - hit_competition c on c.id = s.competition_id - GROUP BY - s.id) as t1, - (SELECT - s.id AS student_id, - CONCAT('[', - GROUP_CONCAT(JSON_QUOTE(t.teacher_name) ORDER BY t.teacher_name SEPARATOR ','), - ']') AS guide_names - FROM - hit_registration_student_info s - LEFT JOIN - hit_registration_teach_info t ON JSON_CONTAINS(s.guide_ids, CAST(t.id AS JSON), '$') - GROUP BY - s.id) as t2 - where t1.id = t2.student_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml index a67b593..1bb6513 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,20 +18,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, teacher_name, teacher_job, teacher_number, teacher_email, teacher_school, remark, del_flag, create_time, create_by, update_time, update_by from hit_registration_teach_info + select id, hit_reg_id, teacher_name, teacher_job, teacher_number, teacher_email, teacher_school, remark, del_flag, create_time, create_by, update_time, update_by, type from hit_registration_teach_info @@ -43,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into hit_registration_teach_info id, + hit_reg_id, teacher_name, teacher_job, teacher_number, @@ -54,9 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, update_time, update_by, + type, #{id}, + #{hitRegId}, #{teacherName}, #{teacherJob}, #{teacherNumber}, @@ -68,12 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createBy}, #{updateTime}, #{updateBy}, + #{type}, update hit_registration_teach_info + hit_reg_id = #{hitRegId}, teacher_name = #{teacherName}, teacher_job = #{teacherJob}, teacher_number = #{teacherNumber}, @@ -85,11 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, + type = #{type}, where id = #{id} - delete from hit_registration_teach_info where id = #{id} @@ -100,8 +109,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - - \ No newline at end of file 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 9b2ce24..647d40d 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 @@ -115,7 +115,8 @@ 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").permitAll() + .antMatchers("/api/**", "/ueditor/**","/system/dict/data/type/sys_user_sex","/system/dict/data/type/imitation_type" + ,"/system/dict/data/type/school_name").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/ruoyi-ui/public/static/附件2_报名表.docx b/ruoyi-ui/public/static/附件2_报名表.docx new file mode 100644 index 0000000000000000000000000000000000000000..d6659024d5f8a2e5357423c0412e0d64a6e538bd GIT binary patch literal 18326 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 literal 0 HcmV?d00001 diff --git a/ruoyi-ui/src/api/hit/registrationStudentInfo.js b/ruoyi-ui/src/api/hit/registrationStudentInfo.js index 27c9fd3..846a363 100644 --- a/ruoyi-ui/src/api/hit/registrationStudentInfo.js +++ b/ruoyi-ui/src/api/hit/registrationStudentInfo.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询报名信息列表 export function listHitRegistrationStudentInfo(query) { return request({ - url: '/hit/hitRegistrationStudentInfo/list', + url: '/system/hit_reg_info/list', method: 'get', params: query }) @@ -29,7 +29,7 @@ export function addHitRegistrationStudentInfo(data) { // 修改报名信息 export function updateHitRegistrationStudentInfo(data) { return request({ - url: '/hit/hitRegistrationStudentInfo', + url: '/system/hit_reg_info', method: 'put', data: data }) diff --git a/ruoyi-ui/src/api/officialWebsite/registerStudent.js b/ruoyi-ui/src/api/officialWebsite/registerStudent.js index 8d5b7c0..f505a1b 100644 --- a/ruoyi-ui/src/api/officialWebsite/registerStudent.js +++ b/ruoyi-ui/src/api/officialWebsite/registerStudent.js @@ -10,7 +10,7 @@ export function addTeacher(data){ export function register(data){ return request({ - url: "/api/registerStudent", + url: "/system/hit_reg_info", method: "post", data }) diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue index 292a358..e3d7ae2 100644 --- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue +++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue @@ -1,52 +1,22 @@