From 8448298a70d3b950104bb8ae73ea5081c8183b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 15 Aug 2025 18:30:07 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hezhi/controller/TbCourseController.java | 2 +- ruoyi-common/pom.xml | 2 +- .../com/ruoyi/hezhi/domain/TbExamSubject.java | 2 +- .../com/ruoyi/hezhi/domain/TbMajorClass.java | 39 +++++++----------- .../mapper/TbConferencePeopleMapper.java | 8 ++++ .../impl/TbConferenceNoticeServiceImpl.java | 9 +++- .../impl/TbLiveBroadcastServiceImpl.java | 8 +++- .../mapper/hezhi/TbConferencePeopleMapper.xml | 8 ++++ .../mapper/hezhi/TbLiveBroadcastMapper.xml | 2 +- ...\345\205\245\346\250\241\346\235\277.xlsx" | Bin 11620 -> 11802 bytes ruoyi-ui/src/views/hezhi/config/index.vue | 2 +- ruoyi-ui/src/views/hezhi/course/index.vue | 31 ++++++-------- ruoyi-ui/src/views/hezhi/exam/index.vue | 24 +++++------ .../src/views/hezhi/examSubject/index.vue | 6 ++- ruoyi-ui/src/views/hezhi/notice/index.vue | 4 ++ 15 files changed, 82 insertions(+), 65 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/hezhi/controller/TbCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/hezhi/controller/TbCourseController.java index ba23660..f7b2627 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/hezhi/controller/TbCourseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/hezhi/controller/TbCourseController.java @@ -97,7 +97,7 @@ public class TbCourseController extends BaseController public AjaxResult add(@RequestBody TbCourse tbCourse) { if (tbCourse.getMajorId() == null) { - return AjaxResult.error("请选择课程分类"); + return AjaxResult.error("请选择专业分类"); } tbCourse.setViewsNum(0); tbCourseService.insertTbCourse(tbCourse); diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 857c9f2..465adcc 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -178,7 +178,7 @@ 23.4 jdk17 system - F:/Maven/maven-repo/com/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar + D:/apache-maven-3.6.2/repository/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbExamSubject.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbExamSubject.java index 220808d..302c875 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbExamSubject.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbExamSubject.java @@ -36,7 +36,7 @@ public class TbExamSubject extends BaseEntity private String examType; /** 等级 */ - @Excel(name = "等级",readConverterExp = "1=初级,2=中级,3=高级") + @Excel(name = "等级",readConverterExp = "1=初级,2=中级,3=高级,4=技师") private Integer level; /** 考试ID exam_id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java index f3ef85e..3484894 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java @@ -24,19 +24,15 @@ public class TbMajorClass extends TreeEntity private static final long serialVersionUID = 1L; /** 专业分类主键ID */ - @Excel(name = "专业分类主键ID") private Long majorId; /** 父级ID */ - @Excel(name = "父级ID") private Long pid; /** 层级 0 1 2 */ - @Excel(name = "层级 0 1 2 ") private Integer level; /** 类型（0-全部） */ - @Excel(name = "类型", readConverterExp = "0=-全部") private Integer type; /** 专业名称 */ @@ -44,72 +40,65 @@ public class TbMajorClass extends TreeEntity private String majorName; /** logo1 */ - @Excel(name = "logo1") + @Excel(name = "logo1", cellType = Excel.ColumnType.IMAGE, width = 10, height = 30) private String majorLogoOne; /** logo2 */ - @Excel(name = "logo2") + @Excel(name = "logo2", cellType = Excel.ColumnType.IMAGE, width = 10, height = 30) private String majorLogoTwo; - /** 推荐（0-否，1-推荐） */ - @Excel(name = "推荐", readConverterExp = "0=-否，1-推荐") + /** 推荐（0-否，1-是） */ + @Excel(name = "推荐", readConverterExp = "0=否,1=是") private Integer isRecommend; - /** 备注 */ - @Excel(name = "备注") - private String remarks; - /** 排序 */ @Excel(name = "排序") private Integer sort; /** 状态（0-显示，1-隐藏） */ - @Excel(name = "状态", readConverterExp = "0=-显示，1-隐藏") + @Excel(name = "状态", readConverterExp = "0=显示,1=隐藏") private Integer status; + /** 备注 */ + @Excel(name = "备注") + private String remarks; + /** 发布时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd") private Date publicationTime; + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** 发布人 */ - @Excel(name = "发布人") private String publisher; /** 删除时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deleteTime; /** 删除人 */ - @Excel(name = "删除人") private String deleteBy; /** 删除标记（0-正常，1-删除） */ private Integer delFlag; /** 专业详情 */ - @Excel(name = "专业详情") private String majorDetails; /** 专业概述 */ - @Excel(name = "专业概述") private String majorOverview; /** 专业大纲 */ - @Excel(name = "专业大纲") private String majorSyllabus; /** 预备知识 */ - @Excel(name = "预备知识") private String majorKnowledge; /** 证书要求 */ - @Excel(name = "证书要求") private String majorCertificate; /** 参考资料 */ - @Excel(name = "参考资料") private String majorInformation; private List childrenList; diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbConferencePeopleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbConferencePeopleMapper.java index 2b068a2..882f052 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbConferencePeopleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbConferencePeopleMapper.java @@ -53,6 +53,14 @@ public interface TbConferencePeopleMapper */ public int deleteTbConferencePeopleByConferencePeopleId(Long conferencePeopleId); + /** + * 删除数字教育大会参会嘉宾根据会议通知ID + * + * @param conferenceNoticeIds 数字教育大会会议ID + * @return 结果 + */ + public int deleteTbConferencePeopleByConferenceNoticeIds(Long[] conferenceNoticeIds); + /** * 批量删除数字教育大会参会嘉宾 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbConferenceNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbConferenceNoticeServiceImpl.java index d0f1285..0c3f4d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbConferenceNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbConferenceNoticeServiceImpl.java @@ -4,6 +4,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.hezhi.domain.TbConferenceNotice; import com.ruoyi.hezhi.mapper.TbConferenceNoticeMapper; +import com.ruoyi.hezhi.mapper.TbConferencePeopleMapper; import com.ruoyi.hezhi.service.ITbConferenceNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +24,8 @@ public class TbConferenceNoticeServiceImpl implements ITbConferenceNoticeService { @Autowired private TbConferenceNoticeMapper tbConferenceNoticeMapper; + @Autowired + private TbConferencePeopleMapper tbConferencePeopleMapper; /** * 查询数字教育大会通知 @@ -89,7 +92,11 @@ public class TbConferenceNoticeServiceImpl implements ITbConferenceNoticeService @Override public int deleteTbConferenceNoticeByConferenceNoticeIds(Long[] conferenceNoticeIds) { - return tbConferenceNoticeMapper.deleteTbConferenceNoticeByConferenceNoticeIds(conferenceNoticeIds); + int flag = tbConferenceNoticeMapper.deleteTbConferenceNoticeByConferenceNoticeIds(conferenceNoticeIds); + if (flag > 0) { + tbConferencePeopleMapper.deleteTbConferencePeopleByConferenceNoticeIds(conferenceNoticeIds); + } + return flag; } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbLiveBroadcastServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbLiveBroadcastServiceImpl.java index b412b44..44d669e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbLiveBroadcastServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbLiveBroadcastServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.hezhi.service.impl; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.hezhi.domain.TbExamCourse; import com.ruoyi.hezhi.domain.TbLiveBroadcast; import com.ruoyi.hezhi.mapper.TbExamCourseMapper; @@ -146,13 +147,16 @@ public class TbLiveBroadcastServiceImpl implements ITbLiveBroadcastService try { Date startDate = dateFormat.parse(startTime); - Date endDate = dateFormat.parse(endTime); + Date endDate = null; + if (StringUtils.isNotEmpty(endTime)) { + endDate = dateFormat.parse(endTime); + } // 直播状态（0-未开始，1-进行中，2-已结束） int liveBroadStatus = 0; Date nowDate = DateUtils.getNowDate(); if (nowDate.before(startDate)){ stringObjectMap.put("liveBroadcastUrl", null); - }else if (nowDate.after(endDate)){ + }else if (null != endDate && nowDate.after(endDate)){ liveBroadStatus = 2; stringObjectMap.put("liveBroadcastUrl", null); }else { diff --git a/ruoyi-system/src/main/resources/mapper/hezhi/TbConferencePeopleMapper.xml b/ruoyi-system/src/main/resources/mapper/hezhi/TbConferencePeopleMapper.xml index edd0002..dbac263 100644 --- a/ruoyi-system/src/main/resources/mapper/hezhi/TbConferencePeopleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/hezhi/TbConferencePeopleMapper.xml @@ -134,6 +134,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from tb_conference_people where conference_people_id = #{conferencePeopleId} + + delete from tb_conference_people where conference_notice_id in + + #{conferenceNoticeIds} + + + delete from tb_conference_people where conference_people_id in @@ -141,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +