1.bug修复

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

@@ -214,7 +214,7 @@ public class TbExamSimulateInfoServiceImpl implements ITbExamSimulateInfoService
 
         }
 
-        return tbExamSimulateInfoMapper. getSimulateSubjectAllInfo(params);
+        return tbExamSimulateInfoMapper.getSimulateSubjectAllInfo(params);
     }
 
     /**

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

@@ -174,27 +174,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CONVERT(IFNULL(tsc.study_center_tag, ''), CHAR) AS studyCenterTag,
         CONVERT(IFNULL(tsc.study_center_background, ''), CHAR) AS studyCenterBackground,
         CONVERT(IFNULL(tsc.school_name, ''), CHAR) AS schoolName,
-        CONVERT(IFNULL(tsc.study_center_title, ''), CHAR) AS studyCenterTitle,
-        tl.link_one AS isRecommend
-        from tb_link tl
-        left join tb_study_center tsc on tl.resources_one_id = tsc.study_center_id
-        left join tb_continuing_education_class tcec on tl.resources_two_id = tcec.continuing_education_class_id
+        CONVERT(IFNULL(tsc.study_center_title, ''), CHAR) AS studyCenterTitle
+        FROM tb_study_center tsc
+        LEFT JOIN tb_continuing_education_class tcec ON tsc.continuing_education_class_id = tcec.continuing_education_class_id
         <where>
             <if test="continuingEducationClassId != null and continuingEducationClassId != '' and continuingEducationClassId != 0">
                 AND tsc.continuing_education_class_id = #{continuingEducationClassId}
             </if>
-            <if test="isRecommend != null and isRecommend != '' and isRecommend != 0">
-                AND tl.link_one = 1
-            </if>
+<!--            <if test="isRecommend != null and isRecommend != '' and isRecommend != 0">-->
+<!--                AND tl.link_one = 1-->
+<!--            </if>-->
             <if test="searchValue != null and searchValue != ''">
-                AND (
-                tsc.study_center_name like concat('%', #{searchValue}, '%')
-                )
+                AND (tsc.study_center_name like concat('%', #{searchValue}, '%'))
             </if>
-            and tl.type = 4
             and tsc.status = 0
             and tsc.del_flag = 0
         </where>
-        order by tl.link_one desc, tsc.sort asc, tsc.create_time desc
+        order by tsc.sort asc, tsc.create_time desc
     </select>
 </mapper>

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

@@ -209,7 +209,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getExamNoticeInfo" resultType="map">
         SELECT
             ten.exam_notice_id AS examNoticeId,
-
             <choose>
                 <when test="examNoticeId != null and examNoticeId !=''">
                     ten.exam_id AS examId,

ruoyi-ui/src/components/VideoUpload/index.vue

@@ -114,6 +114,7 @@ export default {
         });
         if (!isTypeOk) {
           this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          this.loading = false
           return false;
         }
       }
@@ -122,6 +123,7 @@ export default {
         const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
           this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          this.loading = false
           return false;
         }
       }

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

@@ -137,7 +137,7 @@
           <tooltip :contentName="scope.row.evaluateAgencyTag" />
         </template>
       </el-table-column>
- 
+
       <!--      <el-table-column align="center" prop="screenTeacher" width="50">-->
       <!--        <template slot-scope="scope">-->
       <!--          <el-link type="primary" @click="getEvaluateAgencyCourseList(scope.row)">-->
@@ -321,6 +321,7 @@ export default {
   dicts: ['tb_examine_status', 'tb_status', 'tb_frozen_status', 'tb_is_recommend'],
   data() {
     return {
+      evaluateAgencyId: undefined,
       openEvaluateAgencyCourse: false,
       // 评价机构分类
       evaluateAgencyClassList: [],

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

@@ -83,6 +83,7 @@
         <template slot-scope="scope">
           <span v-if="scope.row.examType ? scope.row.examType.includes('0') : false">考试</span>
           <span v-if="scope.row.examType ? scope.row.examType.includes(['0', '1']) : false">、</span>
+          <span v-if="scope.row.examType ? scope.row.examType.includes(['1', '0']) : false">、</span>
           <span v-if="scope.row.examType ? scope.row.examType.includes('1') : false">模拟考试</span>
         </template>
       </el-table-column>

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

@@ -426,7 +426,7 @@ export default {
         discussScore: 0,
         totalScore: null,
         passScore: 60,
-        simulationExamMinute: null,
+        simulationExamMinute: 60,
         simulationStatus: 0,
         examCourseList: []
       };