1.bug修复

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);

ruoyi-common/pom.xml

@@ -178,7 +178,7 @@
             <version>23.4</version>
             <classifier>jdk17</classifier>
             <scope>system</scope>
-            <systemPath>F:/Maven/maven-repo/com/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar</systemPath>
+            <systemPath>D:/apache-maven-3.6.2/repository/aspose/aspose-words/23.4/aspose-words-23.4-jdk17.jar</systemPath>
         </dependency>
 
         <dependency>

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 */

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<TbMajorClass> childrenList;

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);
+
     /**
      * 批量删除数字教育大会参会嘉宾
      *

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;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbLiveBroadcastServiceImpl.java

 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 {

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>
 
+    <delete id="deleteTbConferencePeopleByConferenceNoticeIds">
+        delete from tb_conference_people where conference_notice_id in
+        <foreach item="conferenceNoticeIds" collection="array" open="(" separator="," close=")">
+            #{conferenceNoticeIds}
+        </foreach>
+    </delete>
+
     <delete id="deleteTbConferencePeopleByConferencePeopleIds" parameterType="String">
         delete from tb_conference_people where conference_people_id in
         <foreach item="conferencePeopleId" collection="array" open="(" separator="," close=")">
@@ -141,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+
     <select id="getConferencePeopleList" resultType="map">
         select
             conference_people_id AS conferencePeopleId,

ruoyi-system/src/main/resources/mapper/hezhi/TbLiveBroadcastMapper.xml

@@ -219,7 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 tlb.live_broadcast_introduce like concat('%', #{searchValue}, '%')
                 )
             </if>
-            <if test="type != null and type == '1'.toString()">
+            <if test="type != null and type == 1">
                 and tlb.start_time >= now()
             </if>
             and tlb.status = 0

ruoyi-ui/src/views/hezhi/config/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent v-show="showSearch" label-width="68px">
       <el-form-item label="设置名称" prop="name">
         <el-input
           v-model="queryParams.name"

ruoyi-ui/src/views/hezhi/course/index.vue

@@ -191,10 +191,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="职业分类" prop="majorId">
-          <el-select v-model="form.majorId" placeholder="请选择职业分类" clearable>
-            <el-option v-for="(item, index) in majorClassList" :key="index" :label="item.majorName"
-              :value="parseInt(item.majorId)" />
+        <el-form-item label="专业分类" prop="majorId">
+          <el-select v-model="form.majorId" placeholder="请选择专业分类" clearable>
+            <el-option v-for="(item, index) in majorClassList" :key="index" :label="item.majorName" :value="parseInt(item.majorId)" />
           </el-select>
         </el-form-item>
         <el-form-item label="职业类型" prop="classType">
@@ -240,9 +239,9 @@
         <el-form-item label="职业概述" prop="courseOverview">
           <editor v-model="form.courseOverview" :min-height="100" />
         </el-form-item>
-        <!--        <el-form-item label="职业大纲" prop="courseSyllabus">-->
-        <!--          <editor v-model="form.courseSyllabus" :min-height="100"/>-->
-        <!--        </el-form-item>-->
+        <el-form-item label="职业大纲" prop="courseSyllabus">
+          <editor v-model="form.courseSyllabus" :min-height="100"/>
+        </el-form-item>
         <el-form-item label="预备知识" prop="courseKnowledge">
           <editor v-model="form.courseKnowledge" :min-height="100" />
         </el-form-item>
@@ -261,8 +260,7 @@
 
         <el-form-item label="推荐" prop="isRecommend">
           <el-radio-group v-model="form.isRecommend">
-            <el-radio v-for="dict in dict.type.tb_is_recommend" :key="dict.value" :label="parseInt(dict.value)">{{
-              dict.label }}</el-radio>
+            <el-radio v-for="dict in dict.type.tb_is_recommend" :key="dict.value" :label="parseInt(dict.value)">{{dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -378,21 +376,18 @@ export default {
         //   { required: true, trigger: "blur", message: "请选择职业分类" },
         // ],
         evaluateAgencyId: [
-          { required: true, trigger: "blur", message: "评价机构不能为空" },
+          { required: true, trigger: "change", message: "评价机构不能为空" },
         ],
         courseName: [
           { required: true, trigger: "blur", message: "请输入职业名称" },
         ],
+        majorId: [
+          { required: true, trigger: "change", message: "请输入专业分类" },
+        ],
       },
       classTypeOptions: [
-        {
-          label: '职业考试',
-          value: 1
-        },
-        {
-          label: '职业技能',
-          value: 2
-        },
+        {label: '职业考试', value: 1},
+        {label: '职业技能', value: 2},
       ],
       evaluateAgencyOptions: undefined,
       majorClassList: undefined,

ruoyi-ui/src/views/hezhi/exam/index.vue

@@ -413,7 +413,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="模拟考试单选题数" prop="singleSelectNum">
+            <el-form-item label="考试单选题数" prop="singleSelectNum">
               <el-input-number v-model="form.singleSelectNum" :step="1" :min="0" step-strictly />
             </el-form-item>
           </el-col>
@@ -423,7 +423,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="模拟考试多选题数" prop="manySelectNum">
+            <el-form-item label="考试多选题数" prop="manySelectNum">
               <el-input-number v-model="form.manySelectNum" :step="1" :min="0" step-strictly />
             </el-form-item>
           </el-col>
@@ -433,7 +433,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="模拟考试判断题数" prop="judgeNum">
+            <el-form-item label="考试判断题数" prop="judgeNum">
               <el-input-number v-model="form.judgeNum" :step="1" :min="0" step-strictly />
             </el-form-item>
           </el-col>
@@ -443,7 +443,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="模拟考试论述题数" prop="discussNum">
+            <el-form-item label="考试论述题数" prop="discussNum">
               <el-input-number v-model="form.discussNum" :step="1" :min="0" step-strictly />
             </el-form-item>
           </el-col>
@@ -691,14 +691,14 @@ export default {
         title: null,
         content: null,
         introduce: null,
-        singleSelectNum: 1,
-        singleSelectScore: 1,
-        manySelectNum: 1,
-        manySelectScore: 1,
-        judgeNum: 1,
-        judgeScore: 1,
-        discussNum: 1,
-        discussScore: 1,
+        singleSelectNum: 0,
+        singleSelectScore: 0,
+        manySelectNum: 0,
+        manySelectScore: 0,
+        judgeNum: 0,
+        judgeScore: 0,
+        discussNum: 0,
+        discussScore: 0,
         totalScore: null,
         passScore: 60,
         examMinute: 10,

ruoyi-ui/src/views/hezhi/examSubject/index.vue

@@ -33,8 +33,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="daterangeCreateTime" style="width: 240px"
+                        value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        :default-time="['00:00:00', '23:59:59']"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

ruoyi-ui/src/views/hezhi/notice/index.vue

@@ -414,6 +414,10 @@ export default {
           if (this.form.type !== 1) {
             this.form.typeTwo = 0;
           }
+          if (this.form.content.length <= 11) {
+            this.$modal.msgError('内容不能为空')
+            return
+          }
 
           if (this.form.noticeId != null) {
             updateNotice(this.form).then((response) => {